--- old/src/hotspot/cpu/arm/assembler_arm.hpp	2018-03-07 23:00:51.645932002 -0500
+++ new/src/hotspot/cpu/arm/assembler_arm.hpp	2018-03-07 23:00:50.770372400 -0500
@@ -76,7 +76,7 @@
 
 
 // ARM Addressing Modes 2 and 3 - Load and store
-class Address VALUE_OBJ_CLASS_SPEC {
+class Address {
  private:
   Register  _base;
   Register  _index;
@@ -334,7 +334,7 @@
 };
 
 #ifdef COMPILER2
-class VFP VALUE_OBJ_CLASS_SPEC {
+class VFP {
   // Helper classes to detect whether a floating point constant can be
   // encoded in a fconstd or fconsts instruction
   // The conversion from the imm8, 8 bit constant, to the floating