Mercurial > hg > graal-jvmci-8
diff src/cpu/x86/vm/runtime_x86_64.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | cd3d6a6b95d9 |
children |
line wrap: on
line diff
--- a/src/cpu/x86/vm/runtime_x86_64.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/cpu/x86/vm/runtime_x86_64.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -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"