--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Tue Nov 24 10:30:23 2015 +0100
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Mon Nov 23 11:06:14 2015 +0100
@@ -210,7 +210,7 @@
case fpu2long_stub_id:
case unwind_exception_id:
case counter_overflow_id:
-#if defined(SPARC) || defined(PPC)
+#if defined(SPARC) || defined(PPC32)
case handle_exception_nofpu_id: // Unused on sparc
#endif
break;
@@ -1097,7 +1097,7 @@
ShouldNotReachHere();
}
-#if defined(SPARC) || defined(PPC)
+#if defined(SPARC) || defined(PPC32)
if (load_klass_or_mirror_patch_id ||
stub_id == Runtime1::load_appendix_patching_id) {
// Update the location in the nmethod with the proper
@@ -1195,7 +1195,7 @@
relocInfo::change_reloc_info_for_address(&iter2, (address) instr_pc2,
relocInfo::none, rtype);
#endif
-#ifdef PPC
+#ifdef PPC32
{ address instr_pc2 = instr_pc + NativeMovConstReg::lo_offset;
RelocIterator iter2(nm, instr_pc2, instr_pc2 + 1);
relocInfo::change_reloc_info_for_address(&iter2, (address) instr_pc2,