--- old/src/hotspot/cpu/arm/interpreterRT_arm.hpp	2018-09-17 10:30:15.653525926 -0400
+++ new/src/hotspot/cpu/arm/interpreterRT_arm.hpp	2018-09-17 10:30:14.123436559 -0400
@@ -34,13 +34,9 @@
   int  _ireg;
 
 #ifdef __ABI_HARD__
-#ifdef AARCH64
-  int _freg;
-#else
   int _fp_slot; // number of FPR's with arguments loaded
   int _single_fpr_slot;
 #endif
-#endif
 
   void move(int from_offset, int to_offset);
   void box(int from_offset, int to_offset);
@@ -60,10 +56,8 @@
   void generate(uint64_t fingerprint);
 };
 
-#ifndef AARCH64
 // ARM provides a normalized fingerprint for native calls (to increase
 // sharing). See normalize_fast_native_fingerprint
 #define SHARING_FAST_NATIVE_FINGERPRINTS
-#endif
 
 #endif // CPU_ARM_VM_INTERPRETERRT_ARM_HPP