* sysdeps/sparc/sparc32/bits/atomic.h: New file.

	* sysdeps/sparc/sparc32/sparcv9/bits/atomic.h: New file.
	* sysdeps/sparc/sparc64/bits/atomic.h: New file.
	* sysdeps/sparc/sparc32/atomicity.h: Removed.
	* sysdeps/sparc/sparc32/sparcv9/atomicity.h: Removed.
	* sysdeps/sparc/sparc64/atomicity.h: Removed.

4 files changed, 163 insertions, 180 deletions

diff --git a/sysdeps/sparc/sparc32/atomicity.h b/sysdeps/sparc/sparc32/atomicity.h
index ec82541c20..e69de29bb2 100644
--- a/sysdeps/sparc/sparc32/atomicity.h
+++ b/sysdeps/sparc/sparc32/atomicity.h
@@ -1,98 +0,0 @@
-/* Low-level functions for atomic operations.  Sparc32 version.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ATOMICITY_H
-#define _ATOMICITY_H	1
-
-#include <inttypes.h>
-
-static int
-__attribute__ ((unused))
-exchange_and_add (volatile uint32_t *mem, int val)
-{
-  static unsigned char lock;
-  int result, tmp;
-
-  __asm__ __volatile__("1:	ldstub	[%1], %0\n\t"
-		       "	cmp	%0, 0\n\t"
-		       "	bne	1b\n\t"
-		       "	 nop"
-		       : "=&r" (tmp)
-		       : "r" (&lock)
-		       : "memory");
-  result = *mem;
-  *mem += val;
-  __asm__ __volatile__("stb	%%g0, [%0]"
-		       : /* no outputs */
-		       : "r" (&lock)
-		       : "memory");
-  return result;
-}
-
-static void
-__attribute__ ((unused))
-atomic_add (volatile uint32_t *mem, int val)
-{
-  static unsigned char lock;
-  int tmp;
-
-  __asm__ __volatile__("1:	ldstub	[%1], %0\n\t"
-		       "	cmp	%0, 0\n\t"
-		       "	bne	1b\n\t"
-		       "	 nop"
-		       : "=&r" (tmp)
-		       : "r" (&lock)
-		       : "memory");
-  *mem += val;
-  __asm__ __volatile__("stb	%%g0, [%0]"
-		       : /* no outputs */
-		       : "r" (&lock)
-		       : "memory");
-}
-
-static int
-__attribute__ ((unused))
-compare_and_swap (volatile long int *p, long int oldval, long int newval)
-{
-  static unsigned char lock;
-  int ret, tmp;
-
-  __asm__ __volatile__("1:	ldstub	[%1], %0\n\t"
-		       "	cmp	%0, 0\n\t"
-		       "	bne	1b\n\t"
-		       "	 nop"
-		       : "=&r" (tmp)
-		       : "r" (&lock)
-		       : "memory");
-  if (*p != oldval)
-    ret = 0;
-  else
-    {
-      *p = newval;
-      ret = 1;
-    }
-  __asm__ __volatile__("stb	%%g0, [%0]"
-		       : /* no outputs */
-		       : "r" (&lock)
-		       : "memory");
-
-  return ret;
-}
-
-#endif /* atomicity.h */
diff --git a/sysdeps/sparc/sparc32/bits/atomic.h b/sysdeps/sparc/sparc32/bits/atomic.h
new file mode 100644
index 0000000000..c4e0abfe06
--- /dev/null
+++ b/sysdeps/sparc/sparc32/bits/atomic.h
@@ -0,0 +1,75 @@
+/* Atomic operations.  sparc32 version.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#ifndef _BITS_ATOMIC_H
+#define _BITS_ATOMIC_H	1
+
+/* We have no compare and swap, just test and set.
+   The following implementation contends on one single global lock
+   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"),
+		  visibility ("hidden")));
+
+#define __sparc32_atomic_do_lock() \
+  do								      \
+    {								      \
+      unsigned int __old_lock;					      \
+      do							      \
+	__asm ("ldstub %1, %0"					      \
+	       : "=r" (__old_lock), "=m" (__sparc32_atomic_lock)      \
+	       : "m" (__sparc32_atomic_lock));			      \
+      while (__old_lock);					      \
+    }								      \
+  while (0)
+
+#define __sparc32_atomic_do_unlock() \
+  do __sparc32_atomic_lock = 0; while (0)
+
+/* The only basic operation needed is compare and exchange.  */
+#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __acev_memp = (mem);			      \
+     __typeof (*mem) __acev_ret;				      \
+     __typeof (*mem) __acev_newval = (newval);			      \
+								      \
+     __sparc32_atomic_do_lock ();				      \
+     __acev_ret = *__acev_memp;					      \
+     if (__acev_ret == (oldval))				      \
+       *__acev_memp = __acev_newval;				      \
+     __sparc32_atomic_do_unlock ();				      \
+     __acev_ret; })
+
+#define atomic_compare_and_exchange_bool_acq(mem, newval, oldval) \
+  ({ __typeof (mem) __aceb_memp = (mem);			      \
+     int __aceb_ret;						      \
+     __typeof (*mem) __aceb_newval = (newval);			      \
+								      \
+     __sparc32_atomic_do_lock ();				      \
+     __aceb_ret = 0;						      \
+     if (*__aceb_memp == (oldval))				      \
+       *__aceb_memp = __aceb_newval;				      \
+     else							      \
+       __aceb_ret = 1;						      \
+     __sparc32_atomic_do_unlock ();				      \
+     __aceb_ret; })
+
+#endif	/* bits/atomic.h */
diff --git a/sysdeps/sparc/sparc32/sparcv9/atomicity.h b/sysdeps/sparc/sparc32/sparcv9/atomicity.h
index f32ddf4ffc..e69de29bb2 100644
--- a/sysdeps/sparc/sparc32/sparcv9/atomicity.h
+++ b/sysdeps/sparc/sparc32/sparcv9/atomicity.h
@@ -1,82 +0,0 @@
-/* Low-level functions for atomic operations.  Sparc32+v9 version.
-   Copyright (C) 1999 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#ifndef _ATOMICITY_H
-#define _ATOMICITY_H	1
-
-#include <inttypes.h>
-
-static inline int
-__attribute__ ((unused))
-exchange_and_add (volatile uint32_t *mem, int val)
-{
-  uint32_t tmp1, tmp2;
-
-  __asm__ __volatile__("1:	lduw	[%2], %0\n\t"
-		       "	add	%0, %3, %1\n\t"
-		       "	cas	[%2], %0, %1\n\t"
-		       "	sub	%0, %1, %0\n\t"
-		       "	brnz,pn	%0, 1b\n\t"
-		       "	 nop"
-		       : "=&r" (tmp1), "=&r" (tmp2)
-		       : "r" (mem), "r" (val)
-		       : "memory");
-  return tmp2;
-}
-
-static inline void
-__attribute__ ((unused))
-atomic_add (volatile uint32_t *mem, int val)
-{
-  uint32_t tmp1, tmp2;
-
-  __asm__ __volatile__("1:	lduw	[%2], %0\n\t"
-		       "	add	%0, %3, %1\n\t"
-		       "	cas	[%2], %0, %1\n\t"
-		       "	sub	%0, %1, %0\n\t"
-		       "	brnz,pn	%0, 1b\n\t"
-		       "	 nop"
-		       : "=&r" (tmp1), "=&r" (tmp2)
-		       : "r" (mem), "r" (val)
-		       : "memory");
-}
-
-static inline int
-__attribute__ ((unused))
-compare_and_swap (volatile long int *p, long int oldval, long int newval)
-{
-  register long int tmp, tmp2;
-
-  __asm__ __volatile__("1:	lduw	[%4], %0\n\t"
-		       "	mov	%2, %1\n\t"
-		       "	cmp	%0, %3\n\t"
-		       "	bne,a,pn %%xcc, 2f\n\t"
-		       "	 mov	0, %0\n\t"
-		       "	cas	[%4], %0, %1\n\t"
-		       "	sub	%0, %1, %0\n\t"
-		       "	brnz,pn	%0, 1b\n\t"
-		       "	 mov	1, %0\n\t"
-		       "2:"
-		       : "=&r" (tmp), "=&r" (tmp2)
-		       : "r" (newval), "r" (oldval), "r" (p)
-		       : "memory");
-  return tmp;
-}
-
-#endif /* atomicity.h */
diff --git a/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
new file mode 100644
index 0000000000..edab3bca16
--- /dev/null
+++ b/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
@@ -0,0 +1,88 @@
+/* Atomic operations.  sparcv9 version.
+   Copyright (C) 2003 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
+
+#include <stdint.h>
+
+typedef int8_t atomic8_t;
+typedef uint8_t uatomic8_t;
+typedef int_fast8_t atomic_fast8_t;
+typedef uint_fast8_t uatomic_fast8_t;
+
+typedef int16_t atomic16_t;
+typedef uint16_t uatomic16_t;
+typedef int_fast16_t atomic_fast16_t;
+typedef uint_fast16_t uatomic_fast16_t;
+
+typedef int32_t atomic32_t;
+typedef uint32_t uatomic32_t;
+typedef int_fast32_t atomic_fast32_t;
+typedef uint_fast32_t uatomic_fast32_t;
+
+typedef int64_t atomic64_t;
+typedef uint64_t uatomic64_t;
+typedef int_fast64_t atomic_fast64_t;
+typedef uint_fast64_t uatomic_fast64_t;
+
+typedef intptr_t atomicptr_t;
+typedef uintptr_t uatomicptr_t;
+typedef intmax_t atomic_max_t;
+typedef uintmax_t uatomic_max_t;
+
+
+#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
+  (abort (), 0)
+
+#define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \
+  (abort (), 0)
+
+#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \
+({									      \
+  __typeof (*(mem)) __acev_tmp;						      \
+  __typeof (mem) __acev_mem = (mem);					      \
+  __asm __volatile ("cas [%4], %2, %0"					      \
+		    : "=r" (__acev_tmp), "=m" (*__acev_mem)		      \
+		    : "r" (oldval), "m" (*__acev_mem), "r" (__acev_mem),      \
+		      "0" (newval));					      \
+  __acev_tmp; })
+
+/* This can be implemented if needed.  */
+#define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
+  (abort (), 0)
+
+#define atomic_exchange(mem, newvalue) \
+  ({ __typeof (*(mem)) __oldval;					      \
+     __typeof (mem) __memp = (mem);					      \
+     __typeof (*(mem)) __value = (newvalue);				      \
+									      \
+     if (sizeof (*(mem)) == 4)						      \
+       __asm ("swap %0, %1"						      \
+	      : "=m" (*__memp), "=r" (__oldval)				      \
+	      : "m" (*__memp), "1" (__value));				      \
+     else								      \
+       abort ();							      \
+     __oldval; })
+
+#define atomic_full_barrier() \
+  __asm __volatile ("membar #LoadLoad | #LoadStore"			      \
+			  " | #StoreLoad | #StoreStore" : : : "memory")
+#define atomic_read_barrier() \
+  __asm __volatile ("membar #LoadLoad | #LoadStore" : : : "memory")
+#define atomic_write_barrier() \
+  __asm __volatile ("membar #StoreLoad | #StoreStore" : : : "memory")