Mercurial > hg > graal-jvmci-8

diff src/cpu/x86/vm/relocInfo_x86.cpp @ 7206:d2f8c38e543d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents cd3d6a6b95d9
children 589aa23334ea
line wrap: on
line diff
--- a/src/cpu/x86/vm/relocInfo_x86.cpp	Fri Nov 30 17:00:32 2012 -0800
+++ b/src/cpu/x86/vm/relocInfo_x86.cpp	Fri Dec 07 01:09:03 2012 -0800
@@ -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"