# HG changeset patch
# User bdelsart
# Date 1380193209 25200
# Node ID 60a2d625db36f547bf445e1f1d94bbea781370f7
# Parent  f637d4dc21bb05caeb75085e734b836fa797830b# Parent  d682c6e24fe3145762a6b6e8440e69cf86d34ebe
Merge

diff -r f637d4dc21bb -r 60a2d625db36 src/share/vm/runtime/vm_version.hpp
--- a/src/share/vm/runtime/vm_version.hpp	Thu Sep 26 08:48:15 2013 +0200
+++ b/src/share/vm/runtime/vm_version.hpp	Thu Sep 26 04:00:09 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;}