--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Thu Mar 26 11:05:03 2015 +0100
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp	Mon Apr 13 18:49:59 2015 -0700
@@ -407,14 +407,6 @@
 
 // Machine dependent stuff
 
-#if defined(X86) && defined(COMPILER2) && !defined(JAVASE_EMBEDDED)
-// Include Restricted Transactional Memory lock eliding optimization
-#define INCLUDE_RTM_OPT 1
-#define RTM_OPT_ONLY(code) code
-#else
-#define INCLUDE_RTM_OPT 0
-#define RTM_OPT_ONLY(code)
-#endif
 // States of Restricted Transactional Memory usage.
 enum RTMState {
   NoRTM      = 0x2, // Don't use RTM
@@ -446,6 +438,15 @@
 # include "globalDefinitions_aarch64.hpp"
 #endif
 
+#ifndef INCLUDE_RTM_OPT
+#define INCLUDE_RTM_OPT 0
+#endif
+#if INCLUDE_RTM_OPT
+#define RTM_OPT_ONLY(code) code
+#else
+#define RTM_OPT_ONLY(code)
+#endif
+
 // To assure the IRIW property on processors that are not multiple copy
 // atomic, sync instructions must be issued between volatile reads to
 // assure their ordering, instead of after volatile stores.