--- old/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-08 07:23:19.000000000 -1000
+++ new/src/cpu/x86/vm/macroAssembler_x86.cpp	2015-10-08 07:23:19.000000000 -1000
@@ -2889,7 +2889,7 @@
 }
 
 // !defined(COMPILER2) is because of stupid core builds
-#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2)
+#if !defined(_LP64) || defined(COMPILER1) || !defined(COMPILER2) || INCLUDE_JVMCI
 void MacroAssembler::empty_FPU_stack() {
   if (VM_Version::supports_mmx()) {
     emms();
@@ -2897,7 +2897,7 @@
     for (int i = 8; i-- > 0; ) ffree(i);
   }
 }
-#endif // !LP64 || C1 || !C2
+#endif // !LP64 || C1 || !C2 || INCLUDE_JVMCI
 
 
 // Defines obj, preserves var_size_in_bytes