Mercurial > hg > truffle
diff src/cpu/x86/vm/runtime_x86_32.cpp @ 7212:291ffc492eb6
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Fri, 14 Dec 2012 14:35:13 +0100 |
| parents | cd3d6a6b95d9 |
| children |
line wrap: on
line diff
--- a/src/cpu/x86/vm/runtime_x86_32.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/cpu/x86/vm/runtime_x86_32.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -24,12 +24,11 @@ #include "precompiled.hpp" #ifdef COMPILER2 -#include "asm/assembler.hpp" -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" +#include "asm/macroAssembler.inline.hpp" #include "classfile/systemDictionary.hpp" #include "code/vmreg.hpp" #include "interpreter/interpreter.hpp" -#include "nativeInst_x86.hpp" #include "opto/runtime.hpp" #include "runtime/interfaceSupport.hpp" #include "runtime/sharedRuntime.hpp"