--- a/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Mon Oct 29 11:31:25 2018 -0700
+++ b/src/hotspot/cpu/arm/stubRoutines_arm.hpp	Tue Oct 30 10:39:19 2018 -0400
@@ -40,16 +40,12 @@
 
  private:
 
-#ifndef AARCH64
   static address _idiv_irem_entry;
-#endif
   static address _partial_subtype_check;
 
  public:
 
-#ifndef AARCH64
   static address idiv_irem_entry() { return _idiv_irem_entry; }
-#endif
   static address partial_subtype_check() { return _partial_subtype_check; }
 };
 
@@ -57,13 +53,11 @@
     return return_pc == _call_stub_return_address;
   }
 
-#ifndef AARCH64
   static address _atomic_load_long_entry;
   static address _atomic_store_long_entry;
 
   static address atomic_load_long_entry()                  { return _atomic_load_long_entry; }
   static address atomic_store_long_entry()                 { return _atomic_store_long_entry; }
-#endif
 
 
 #endif // CPU_ARM_VM_STUBROUTINES_ARM_HPP