# HG changeset patch
# User bdelsart
# Date 1380184201 25200
# Node ID d682c6e24fe3145762a6b6e8440e69cf86d34ebe
# Parent  e8a0010ba69eaba41502c51cd2f420e8de90a9b3# Parent  504d8f519adf96a05ef02bb1543d655cb1961930
Merge

diff -r e8a0010ba69e -r d682c6e24fe3 src/share/vm/runtime/vm_version.hpp
--- a/src/share/vm/runtime/vm_version.hpp	Wed Sep 25 13:03:21 2013 -0400
+++ b/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;}