comparison src/cpu/x86/vm/vm_version_x86.cpp @ 7206:d2f8c38e543d

Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents cd3d6a6b95d9
children 291ffc492eb6 2c7f594145dc
comparison
equal deleted inserted replaced
7191:816b7e5bf2ed 7206:d2f8c38e543d
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "assembler_x86.inline.hpp" 26 #include "asm/macroAssembler.hpp"
27 #include "asm/macroAssembler.inline.hpp"
27 #include "memory/resourceArea.hpp" 28 #include "memory/resourceArea.hpp"
28 #include "runtime/java.hpp" 29 #include "runtime/java.hpp"
29 #include "runtime/stubCodeGenerator.hpp" 30 #include "runtime/stubCodeGenerator.hpp"
30 #include "vm_version_x86.hpp" 31 #include "vm_version_x86.hpp"
31 #ifdef TARGET_OS_FAMILY_linux 32 #ifdef TARGET_OS_FAMILY_linux