--- a/src/hotspot/cpu/arm/vm_version_arm.hpp	Mon Oct 29 11:31:25 2018 -0700
+++ b/src/hotspot/cpu/arm/vm_version_arm.hpp	Tue Oct 30 10:39:19 2018 -0400
@@ -41,23 +41,6 @@
   static void initialize();
   static bool is_initialized()      { return _is_initialized; }
 
-#ifdef AARCH64
-
- public:
-  static bool supports_ldrex()         { return true; }
-  static bool supports_ldrexd()        { return true; }
-  static bool supports_movw()          { return true; }
-
-  // Override Abstract_VM_Version implementation
-  static bool use_biased_locking();
-
-  static bool has_simd()               { return _has_simd; }
-  static bool has_vfp()                { return has_simd(); }
-  static bool simd_math_is_compliant() { return true; }
-
-  static bool prefer_moves_over_load_literal() { return true; }
-
-#else
 
  protected:
   enum Feature_Flag {
@@ -121,7 +104,6 @@
 
   friend class VM_Version_StubGenerator;
 
-#endif // AARCH64
 };
 
 #endif // CPU_ARM_VM_VM_VERSION_ARM_HPP