Mercurial > hg > truffle
comparison 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 |
comparison
equal
deleted
inserted
replaced
7163:2ed8d74e5984 | 7212:291ffc492eb6 |
---|---|
21 * questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 #include "precompiled.hpp" | 25 #include "precompiled.hpp" |
26 #include "asm/assembler.inline.hpp" | 26 #include "asm/macroAssembler.hpp" |
27 #include "assembler_x86.inline.hpp" | |
28 #include "code/relocInfo.hpp" | 27 #include "code/relocInfo.hpp" |
29 #include "nativeInst_x86.hpp" | 28 #include "nativeInst_x86.hpp" |
30 #include "oops/oop.inline.hpp" | 29 #include "oops/oop.inline.hpp" |
31 #include "runtime/safepoint.hpp" | 30 #include "runtime/safepoint.hpp" |
32 | 31 |