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

Merge
author roland
date Fri, 07 Dec 2012 01:09:03 -0800
parents f34d701e952e cd3d6a6b95d9
children 291ffc492eb6 2c7f594145dc
line wrap: on
line diff
--- a/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Fri Nov 30 17:00:32 2012 -0800
+++ b/src/cpu/x86/vm/stubGenerator_x86_32.cpp	Fri Dec 07 01:09:03 2012 -0800
@@ -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 "interpreter/interpreter.hpp"
 #include "nativeInst_x86.hpp"
 #include "oops/instanceOop.hpp"