Mercurial > hg > truffle
diff src/cpu/x86/vm/relocInfo_x86.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 | 589aa23334ea |
line wrap: on
line diff
--- a/src/cpu/x86/vm/relocInfo_x86.cpp Fri Dec 14 10:20:54 2012 +0100 +++ b/src/cpu/x86/vm/relocInfo_x86.cpp Fri Dec 14 14:35:13 2012 +0100 @@ -23,8 +23,7 @@ */ #include "precompiled.hpp" -#include "asm/assembler.inline.hpp" -#include "assembler_x86.inline.hpp" +#include "asm/macroAssembler.hpp" #include "code/relocInfo.hpp" #include "nativeInst_x86.hpp" #include "oops/oop.inline.hpp"