Merge

Tue, 03 May 2011 12:19:04 -0700

author
zgu
date
Tue, 03 May 2011 12:19:04 -0700
changeset 2844
e62e515d3a55
parent 2843
f7b5dc171e92
parent 2841
f78b3a5497f2
child 2845
5781ed5f1865

Merge

     1.1 --- a/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	Tue May 03 10:17:29 2011 -0700
     1.2 +++ b/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp	Tue May 03 12:19:04 2011 -0700
     1.3 @@ -93,7 +93,7 @@
     1.4  
     1.5  inline void     OrderAccess::store_fence(jbyte*  p, jbyte  v) {
     1.6    __asm__ volatile (  "xchgb (%2),%0"
     1.7 -                    : "=r" (v)
     1.8 +                    : "=q" (v)
     1.9                      : "0" (v), "r" (p)
    1.10                      : "memory");
    1.11  }
    1.12 @@ -155,7 +155,7 @@
    1.13  // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
    1.14  inline void     OrderAccess::release_store_fence(volatile jbyte*  p, jbyte  v) {
    1.15    __asm__ volatile (  "xchgb (%2),%0"
    1.16 -                    : "=r" (v)
    1.17 +                    : "=q" (v)
    1.18                      : "0" (v), "r" (p)
    1.19                      : "memory");
    1.20  }

mercurial