--- old/src/hotspot/cpu/arm/register_arm.cpp	2018-09-17 10:30:28.338266814 -0400
+++ new/src/hotspot/cpu/arm/register_arm.cpp	2018-09-17 10:30:27.705229839 -0400
@@ -32,12 +32,6 @@
 
 const char* RegisterImpl::name() const {
   const char* names[number_of_registers] = {
-#ifdef AARCH64
-    "x0",  "x1",  "x2",  "x3",  "x4",  "x5",  "x6",  "x7",
-    "x8",  "x9",  "x10", "x11", "x12", "x13", "x14", "x15",
-    "x16", "x17", "x18", "x19", "x20", "x21", "x22", "x23",
-    "x24", "x25", "x26", "x27", "x28", "fp",  "lr",  "xzr", "sp"
-#else
     "r0", "r1", "r2", "r3", "r4", "r5", "r6",
 #if (FP_REG_NUM == 7)
     "fp",
@@ -51,19 +45,12 @@
     "r11",
 #endif
     "r12", "sp", "lr", "pc"
-#endif // AARCH64
   };
   return is_valid() ? names[encoding()] : "noreg";
 }
 
 const char* FloatRegisterImpl::name() const {
   const char* names[number_of_registers] = {
-#ifdef AARCH64
-    "v0",  "v1",  "v2",  "v3",  "v4",  "v5",  "v6",  "v7",
-    "v8",  "v9",  "v10", "v11", "v12", "v13", "v14", "v15",
-    "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23",
-    "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31"
-#else
      "s0",  "s1",  "s2",  "s3",  "s4",  "s5",  "s6",  "s7",
      "s8",  "s9", "s10", "s11", "s12", "s13", "s14", "s15",
     "s16", "s17", "s18", "s19", "s20", "s21", "s22", "s23",
@@ -74,7 +61,6 @@
     "s48", "s49?","s50", "s51?","s52", "s53?","s54", "s55?",
     "s56", "s57?","s58", "s59?","s60", "s61?","s62", "s63?"
 #endif
-#endif // AARCH64
   };
   return is_valid() ? names[encoding()] : "fnoreg";
 }