--- old/src/hotspot/cpu/arm/register_definitions_arm.cpp	2018-09-17 10:30:31.476450107 -0400
+++ new/src/hotspot/cpu/arm/register_definitions_arm.cpp	2018-09-17 10:30:30.844413192 -0400
@@ -31,42 +31,6 @@
 REGISTER_DEFINITION(Register, noreg);
 REGISTER_DEFINITION(FloatRegister, fnoreg);
 
-#ifdef AARCH64
-
-REGISTER_DEFINITION(FloatRegister, V0);
-REGISTER_DEFINITION(FloatRegister, V1);
-REGISTER_DEFINITION(FloatRegister, V2);
-REGISTER_DEFINITION(FloatRegister, V3);
-REGISTER_DEFINITION(FloatRegister, V4);
-REGISTER_DEFINITION(FloatRegister, V5);
-REGISTER_DEFINITION(FloatRegister, V6);
-REGISTER_DEFINITION(FloatRegister, V7);
-REGISTER_DEFINITION(FloatRegister, V8);
-REGISTER_DEFINITION(FloatRegister, V9);
-REGISTER_DEFINITION(FloatRegister, V10);
-REGISTER_DEFINITION(FloatRegister, V11);
-REGISTER_DEFINITION(FloatRegister, V12);
-REGISTER_DEFINITION(FloatRegister, V13);
-REGISTER_DEFINITION(FloatRegister, V14);
-REGISTER_DEFINITION(FloatRegister, V15);
-REGISTER_DEFINITION(FloatRegister, V16);
-REGISTER_DEFINITION(FloatRegister, V17);
-REGISTER_DEFINITION(FloatRegister, V18);
-REGISTER_DEFINITION(FloatRegister, V19);
-REGISTER_DEFINITION(FloatRegister, V20);
-REGISTER_DEFINITION(FloatRegister, V21);
-REGISTER_DEFINITION(FloatRegister, V22);
-REGISTER_DEFINITION(FloatRegister, V23);
-REGISTER_DEFINITION(FloatRegister, V24);
-REGISTER_DEFINITION(FloatRegister, V25);
-REGISTER_DEFINITION(FloatRegister, V26);
-REGISTER_DEFINITION(FloatRegister, V27);
-REGISTER_DEFINITION(FloatRegister, V28);
-REGISTER_DEFINITION(FloatRegister, V29);
-REGISTER_DEFINITION(FloatRegister, V30);
-REGISTER_DEFINITION(FloatRegister, V31);
-
-#else // AARCH64
 
 REGISTER_DEFINITION(FloatRegister, S0);
 REGISTER_DEFINITION(FloatRegister, S1_reg);
@@ -134,4 +98,3 @@
 REGISTER_DEFINITION(FloatRegister, D30);
 REGISTER_DEFINITION(FloatRegister, D31);
 
-#endif //AARCH64