--- a/src/share/vm/code/vmreg.hpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/code/vmreg.hpp	Tue Apr 01 13:57:07 2014 +0200
@@ -47,11 +47,8 @@
 #ifdef TARGET_ARCH_MODEL_arm
 # include "adfiles/adGlobals_arm.hpp"
 #endif
-#ifdef TARGET_ARCH_MODEL_ppc_32
-# include "adfiles/adGlobals_ppc_32.hpp"
-#endif
-#ifdef TARGET_ARCH_MODEL_ppc_64
-# include "adfiles/adGlobals_ppc_64.hpp"
+#ifdef TARGET_ARCH_MODEL_ppc
+# include "adfiles/adGlobals_ppc.hpp"
 #endif
 #endif
 
@@ -73,7 +70,7 @@
 // friend class Location;
 private:
   enum {
-    BAD_REG = -1
+    BAD = -1
   };
 
 
@@ -86,7 +83,7 @@
 
 public:
 
-  static VMReg  as_VMReg(int val, bool bad_ok = false) { assert(val > BAD_REG || bad_ok, "invalid"); return (VMReg) (intptr_t) val; }
+  static VMReg  as_VMReg(int val, bool bad_ok = false) { assert(val > BAD || bad_ok, "invalid"); return (VMReg) (intptr_t) val; }
 
   const char*  name() {
     if (is_reg()) {
@@ -98,8 +95,8 @@
       return "STACKED REG";
     }
   }
-  static VMReg Bad() { return (VMReg) (intptr_t) BAD_REG; }
-  bool is_valid() const { return ((intptr_t) this) != BAD_REG; }
+  static VMReg Bad() { return (VMReg) (intptr_t) BAD; }
+  bool is_valid() const { return ((intptr_t) this) != BAD; }
   bool is_stack() const { return (intptr_t) this >= (intptr_t) stack0; }
   bool is_reg()   const { return is_valid() && !is_stack(); }