Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/sharedRuntime_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 | 1baf7f1e3f23 cd3d6a6b95d9 |
children | b8f261ba79c6 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -23,8 +23,8 @@ */ #include "precompiled.hpp" -#include "asm/assembler.hpp" -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" +#include "asm/macroAssembler.inline.hpp" #include "code/debugInfoRec.hpp" #include "code/icBuffer.hpp" #include "code/vtableStubs.hpp"