changeset 5937:ccc95eb5ca55

8016586: PPC64 (part 3): basic changes for PPC64 Summary: added #includes needed for ppc64 port. Renamed _MODEL_ppc to_MODEL_ppc_32 and renamed corresponding old _ppc files to _ppc_32. Reviewed-by: dholmes, kvn
author goetz
date Fri, 07 Feb 2014 15:08:10 +0100
parents ccb68f77d07a
children f2f5a053bd0d
files make/linux/platform_ppc src/cpu/ppc/vm/stubRoutines_ppc_64.hpp src/share/vm/interpreter/abstractInterpreter.hpp src/share/vm/interpreter/templateTable.hpp src/share/vm/runtime/stubRoutines.hpp
diffstat 5 files changed, 14 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/make/linux/platform_ppc	Fri Feb 07 14:57:01 2014 +0100
+++ b/make/linux/platform_ppc	Fri Feb 07 15:08:10 2014 +0100
@@ -2,11 +2,11 @@
 
 arch = ppc
 
-arch_model = ppc
+arch_model = ppc_32
 
 os_arch = linux_ppc
 
-os_arch_model = linux_ppc
+os_arch_model = linux_ppc_32
 
 lib_arch = ppc
 
--- a/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Fri Feb 07 14:57:01 2014 +0100
+++ b/src/cpu/ppc/vm/stubRoutines_ppc_64.hpp	Fri Feb 07 15:08:10 2014 +0100
@@ -24,7 +24,7 @@
  */
 
 #ifndef CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
-#define CPU_PPC_VM_STUBROUTINES_OJDKPPC_HPP
+#define CPU_PPC_VM_STUBROUTINES_PPC_64_HPP
 
 // This file holds the platform specific parts of the StubRoutines
 // definition. See stubRoutines.hpp for a description on how to
--- a/src/share/vm/interpreter/abstractInterpreter.hpp	Fri Feb 07 14:57:01 2014 +0100
+++ b/src/share/vm/interpreter/abstractInterpreter.hpp	Fri Feb 07 15:08:10 2014 +0100
@@ -41,8 +41,8 @@
 #ifdef TARGET_ARCH_MODEL_arm
 # include "interp_masm_arm.hpp"
 #endif
-#ifdef TARGET_ARCH_MODEL_ppc
-# include "interp_masm_ppc.hpp"
+#ifdef TARGET_ARCH_MODEL_ppc_32
+# include "interp_masm_ppc_32.hpp"
 #endif
 #ifdef TARGET_ARCH_MODEL_ppc_64
 # include "interp_masm_ppc_64.hpp"
--- a/src/share/vm/interpreter/templateTable.hpp	Fri Feb 07 14:57:01 2014 +0100
+++ b/src/share/vm/interpreter/templateTable.hpp	Fri Feb 07 15:08:10 2014 +0100
@@ -40,8 +40,11 @@
 #ifdef TARGET_ARCH_MODEL_arm
 # include "interp_masm_arm.hpp"
 #endif
-#ifdef TARGET_ARCH_MODEL_ppc
-# include "interp_masm_ppc.hpp"
+#ifdef TARGET_ARCH_MODEL_ppc_32
+# include "interp_masm_ppc_32.hpp"
+#endif
+#ifdef TARGET_ARCH_MODEL_ppc_64
+# include "interp_masm_ppc_64.hpp"
 #endif
 
 #ifndef CC_INTERP
@@ -371,8 +374,8 @@
 #ifdef TARGET_ARCH_MODEL_arm
 # include "templateTable_arm.hpp"
 #endif
-#ifdef TARGET_ARCH_MODEL_ppc
-# include "templateTable_ppc.hpp"
+#ifdef TARGET_ARCH_MODEL_ppc_32
+# include "templateTable_ppc_32.hpp"
 #endif
 
 };
--- a/src/share/vm/runtime/stubRoutines.hpp	Fri Feb 07 14:57:01 2014 +0100
+++ b/src/share/vm/runtime/stubRoutines.hpp	Fri Feb 07 15:08:10 2014 +0100
@@ -114,8 +114,8 @@
 #ifdef TARGET_ARCH_MODEL_arm
 # include "stubRoutines_arm.hpp"
 #endif
-#ifdef TARGET_ARCH_MODEL_ppc
-# include "stubRoutines_ppc.hpp"
+#ifdef TARGET_ARCH_MODEL_ppc_32
+# include "stubRoutines_ppc_32.hpp"
 #endif
 #ifdef TARGET_ARCH_MODEL_ppc_64
 # include "stubRoutines_ppc_64.hpp"