--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp	Tue Dec 22 11:03:37 2015 +0100
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.inline.hpp	Tue Dec 22 11:11:29 2015 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -42,24 +42,10 @@
 #define VERIFY_OOP(o)
 #endif
 
-// Platform dependent data manipulation
-#ifdef TARGET_ARCH_x86
-# include "bytecodeInterpreter_x86.inline.hpp"
-#endif
-#ifdef TARGET_ARCH_sparc
-# include "bytecodeInterpreter_sparc.inline.hpp"
-#endif
 #ifdef TARGET_ARCH_zero
 # include "bytecodeInterpreter_zero.inline.hpp"
-#endif
-#ifdef TARGET_ARCH_arm
-# include "bytecodeInterpreter_arm.inline.hpp"
-#endif
-#ifdef TARGET_ARCH_ppc
-# include "bytecodeInterpreter_ppc.inline.hpp"
-#endif
-#ifdef TARGET_ARCH_aarch64
-# include "bytecodeInterpreter_aarch64.inline.hpp"
+#else
+#error "Only Zero Bytecode Interpreter is supported"
 #endif
 
 #endif // CC_INTERP