Mercurial > hg > truffle

changeset 12298:504d8f519adf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author jiangli
date Fri, 20 Sep 2013 20:19:52 -0700
parents 8a6a85321d3a (current diff) 586fa1919a89 (diff)
children d682c6e24fe3
files
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;}