about summary refs log tree commit diff
path: root/sysdeps/sparc/sparc32
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/sparc/sparc32')
-rw-r--r--sysdeps/sparc/sparc32/bits/atomic.h30
-rw-r--r--sysdeps/sparc/sparc32/elf/configure2
2 files changed, 19 insertions, 13 deletions
diff --git a/sysdeps/sparc/sparc32/bits/atomic.h b/sysdeps/sparc/sparc32/bits/atomic.h
index c4e0abfe06..00d799392b 100644
--- a/sysdeps/sparc/sparc32/bits/atomic.h
+++ b/sysdeps/sparc/sparc32/bits/atomic.h
@@ -22,28 +22,34 @@
 #define _BITS_ATOMIC_H	1
 
 /* We have no compare and swap, just test and set.
-   The following implementation contends on one single global lock
+   The following implementation contends on 64 global locks
    per library and assumes no variable will be accessed using atomic.h
    macros from two different libraries.  */
 
-volatile unsigned char __sparc32_atomic_lock
-  __attribute__ ((nocommon, section (".gnu.linkonce.b.__sparc32_atomic_lock"),
+volatile unsigned char __sparc32_atomic_locks[64]
+  __attribute__ ((nocommon, section (".gnu.linkonce.b.__sparc32_atomic_locks"),
 		  visibility ("hidden")));
 
-#define __sparc32_atomic_do_lock() \
+#define __sparc32_atomic_do_lock(addr) \
   do								      \
     {								      \
       unsigned int __old_lock;					      \
+      unsigned int __idx = (((long) addr >> 2) ^ ((long) addr >> 12)) \
+			   & 63;				      \
       do							      \
 	__asm ("ldstub %1, %0"					      \
-	       : "=r" (__old_lock), "=m" (__sparc32_atomic_lock)      \
-	       : "m" (__sparc32_atomic_lock));			      \
+	       : "=r" (__old_lock),				      \
+		 "=m" (__sparc32_atomic_locks[__idx])		      \
+	       : "m" (__sparc32_atomic_locks[__idx]));		      \
       while (__old_lock);					      \
     }								      \
   while (0)
 
-#define __sparc32_atomic_do_unlock() \
-  do __sparc32_atomic_lock = 0; while (0)
+#define __sparc32_atomic_do_unlock(addr) \
+  do								      \
+    __sparc32_atomic_locks[(((long) addr >> 2)			      \
+			    ^ ((long) addr >> 12)) & 63] = 0;	      \
+  while (0)
 
 /* The only basic operation needed is compare and exchange.  */
 #define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
@@ -51,11 +57,11 @@ volatile unsigned char __sparc32_atomic_lock
      __typeof (*mem) __acev_ret;				      \
      __typeof (*mem) __acev_newval = (newval);			      \
 								      \
-     __sparc32_atomic_do_lock ();				      \
+     __sparc32_atomic_do_lock (__acev_memp);			      \
      __acev_ret = *__acev_memp;					      \
      if (__acev_ret == (oldval))				      \
        *__acev_memp = __acev_newval;				      \
-     __sparc32_atomic_do_unlock ();				      \
+     __sparc32_atomic_do_unlock (__acev_memp);			      \
      __acev_ret; })
 
 #define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
@@ -63,13 +69,13 @@ volatile unsigned char __sparc32_atomic_lock
      int __aceb_ret;						      \
      __typeof (*mem) __aceb_newval = (newval);			      \
 								      \
-     __sparc32_atomic_do_lock ();				      \
+     __sparc32_atomic_do_lock (__aceb_memp);			      \
      __aceb_ret = 0;						      \
      if (*__aceb_memp == (oldval))				      \
        *__aceb_memp = __aceb_newval;				      \
      else							      \
        __aceb_ret = 1;						      \
-     __sparc32_atomic_do_unlock ();				      \
+     __sparc32_atomic_do_unlock (__aceb_memp);			      \
      __aceb_ret; })
 
 #endif	/* bits/atomic.h */
diff --git a/sysdeps/sparc/sparc32/elf/configure b/sysdeps/sparc/sparc32/elf/configure
index e5ff89c065..d4f9517959 100644
--- a/sysdeps/sparc/sparc32/elf/configure
+++ b/sysdeps/sparc/sparc32/elf/configure
@@ -29,7 +29,7 @@ baz:	sethi	%tgd_hi22(foo), %l1
 	add	%o0, %l1, %l1, %tldo_add(bar)
 	sethi	%tie_hi22(foo), %l1
 	add	%l1, %tie_lo10(foo), %l1
-	ld	%l7 + %l1, %l1, %tie_ld(foo)
+	ld	[%l7 + %l1], %l1, %tie_ld(foo)
 	add	%g7, %l1, %l1, %tie_add(foo)
 	sethi	%tle_hix22(foo), %l1
 	xor	%l1, %tle_lox10(foo), %l1