--- old/src/hotspot/cpu/arm/stubRoutines_arm.cpp	2018-09-17 10:30:39.424914358 -0400
+++ new/src/hotspot/cpu/arm/stubRoutines_arm.cpp	2018-09-17 10:30:38.791877384 -0400
@@ -27,13 +27,9 @@
 #include "runtime/frame.inline.hpp"
 #include "runtime/stubRoutines.hpp"
 
-#ifndef AARCH64
 address StubRoutines::Arm::_idiv_irem_entry = NULL;
-#endif
 
 address StubRoutines::Arm::_partial_subtype_check = NULL;
 
-#ifndef AARCH64
 address StubRoutines::_atomic_load_long_entry = NULL;
 address StubRoutines::_atomic_store_long_entry = NULL;
-#endif