--- a/hotspot/src/cpu/x86/vm/register_definitions_x86.cpp	Mon Oct 21 17:34:27 2013 -0700
+++ b/hotspot/src/cpu/x86/vm/register_definitions_x86.cpp	Tue Oct 22 09:51:47 2013 +0200
@@ -26,11 +26,8 @@
 #include "asm/assembler.hpp"
 #include "asm/register.hpp"
 #include "register_x86.hpp"
-#ifdef TARGET_ARCH_MODEL_x86_32
-# include "interp_masm_x86_32.hpp"
-#endif
-#ifdef TARGET_ARCH_MODEL_x86_64
-# include "interp_masm_x86_64.hpp"
+#ifdef TARGET_ARCH_x86
+# include "interp_masm_x86.hpp"
 #endif
 
 REGISTER_DEFINITION(Register, noreg);