Mercurial > hg > graal-jvmci-8
diff src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp @ 7206:d2f8c38e543d
Merge
author | roland |
---|---|
date | Fri, 07 Dec 2012 01:09:03 -0800 |
parents | f34d701e952e cd3d6a6b95d9 |
children | 746b070f5022 |
line wrap: on
line diff
--- a/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Fri Nov 30 17:00:32 2012 -0800 +++ b/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Fri Dec 07 01:09:03 2012 -0800 @@ -23,7 +23,7 @@ */ // no precompiled headers -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" #include "classfile/classLoader.hpp" #include "classfile/systemDictionary.hpp" #include "classfile/vmSymbols.hpp" @@ -33,7 +33,6 @@ #include "jvm_solaris.h" #include "memory/allocation.inline.hpp" #include "mutex_solaris.inline.hpp" -#include "nativeInst_x86.hpp" #include "os_share_solaris.hpp" #include "prims/jniFastGetField.hpp" #include "prims/jvm.h"