changeset 20077:a163104932a6

Merge
author bdelsart
date Thu, 26 Sep 2013 01:30:01 -0700
parents 33fd12bdfbdc c5f15e018491
children 049ccc7e1575
files
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/runtime/vm_version.hpp	Wed Sep 25 13:03:21 2013 -0400
+++ b/hotspot/src/share/vm/runtime/vm_version.hpp	Thu Sep 26 01:30:01 2013 -0700
@@ -78,7 +78,13 @@
   static const char* jre_release_version();
 
   // does HW support an 8-byte compare-exchange operation?
-  static bool supports_cx8()  {return _supports_cx8;}
+  static bool supports_cx8()  {
+#ifdef SUPPORTS_NATIVE_CX8
+    return true;
+#else
+    return _supports_cx8;
+#endif
+  }
   // does HW support atomic get-and-set or atomic get-and-add?  Used
   // to guide intrinsification decisions for Unsafe atomic ops
   static bool supports_atomic_getset4()  {return _supports_atomic_getset4;}