Merge

Thu, 26 Sep 2013 01:30:01 -0700

author
bdelsart
date
Thu, 26 Sep 2013 01:30:01 -0700
changeset 5767
d682c6e24fe3
parent 5761
e8a0010ba69e
parent 5766
504d8f519adf
child 5768
60a2d625db36

Merge

     1.1 --- a/src/share/vm/runtime/vm_version.hpp	Wed Sep 25 13:03:21 2013 -0400
     1.2 +++ b/src/share/vm/runtime/vm_version.hpp	Thu Sep 26 01:30:01 2013 -0700
     1.3 @@ -78,7 +78,13 @@
     1.4    static const char* jre_release_version();
     1.5  
     1.6    // does HW support an 8-byte compare-exchange operation?
     1.7 -  static bool supports_cx8()  {return _supports_cx8;}
     1.8 +  static bool supports_cx8()  {
     1.9 +#ifdef SUPPORTS_NATIVE_CX8
    1.10 +    return true;
    1.11 +#else
    1.12 +    return _supports_cx8;
    1.13 +#endif
    1.14 +  }
    1.15    // does HW support atomic get-and-set or atomic get-and-add?  Used
    1.16    // to guide intrinsification decisions for Unsafe atomic ops
    1.17    static bool supports_atomic_getset4()  {return _supports_atomic_getset4;}

mercurial