# HG changeset patch
# User jiangli
# Date 1379733592 25200
# Node ID 504d8f519adf96a05ef02bb1543d655cb1961930
# Parent  8a6a85321d3ac72d203e59caeb0c5c715660da1f# Parent  586fa1919a89a4a9bede04dd35cd42a84b4a6351
Merge

diff -r 8a6a85321d3a -r 504d8f519adf src/share/vm/runtime/vm_version.hpp
--- a/src/share/vm/runtime/vm_version.hpp	Fri Sep 20 11:17:04 2013 -0700
+++ b/src/share/vm/runtime/vm_version.hpp	Fri Sep 20 20:19:52 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;}