|
 |
147e83 |
Backporting the C11 atomic support will allow future algorithms
|
|
|
147e83 |
to be more easily backported to RHEL7. This is initially backported
|
|
|
147e83 |
to support the new semaphore algorithm which is now in RHEL7
|
|
|
147e83 |
(rhbz#1027348).
|
|
|
147e83 |
|
|
|
147e83 |
commit 1ea339b69725cb2f30b5a84cb7ca96111c9a637b
|
|
|
147e83 |
Author: Torvald Riegel <triegel@redhat.com>
|
|
|
147e83 |
Date: Sat Oct 18 01:02:59 2014 +0200
|
|
|
147e83 |
|
|
|
147e83 |
Add arch-specific configuration for C11 atomics support.
|
|
|
147e83 |
|
|
|
147e83 |
This sets __HAVE_64B_ATOMICS if provided. It also sets
|
|
|
147e83 |
USE_ATOMIC_COMPILER_BUILTINS to true if the existing atomic ops use the
|
|
|
147e83 |
__atomic* builtins (aarch64, mips partially) or if this has been
|
|
|
147e83 |
tested (x86_64); otherwise, this is set to false so that C11 atomics will
|
|
|
147e83 |
be based on the existing atomic operations.
|
|
|
147e83 |
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/aarch64/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/aarch64/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/aarch64/bits/atomic.h
|
|
|
147e83 |
@@ -36,6 +36,8 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 1
|
|
|
147e83 |
|
|
|
147e83 |
/* Compare and exchange.
|
|
|
147e83 |
For all "bool" routines, we return FALSE if exchange succesful. */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/alpha/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/alpha/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/alpha/bits/atomic.h
|
|
|
147e83 |
@@ -42,6 +42,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef UP
|
|
|
147e83 |
# define __MB /* nothing */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/arm/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/arm/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/arm/bits/atomic.h
|
|
|
147e83 |
@@ -33,6 +33,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
void __arm_link_error (void);
|
|
|
147e83 |
|
|
|
147e83 |
/* Use the atomic builtins provided by GCC in case the backend provides
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/i386/i486/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/i386/i486/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/i386/i486/bits/atomic.h
|
|
|
147e83 |
@@ -54,6 +54,9 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
# endif
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
|
|
|
147e83 |
__sync_val_compare_and_swap (mem, oldval, newval)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/ia64/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/ia64/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/ia64/bits/atomic.h
|
|
|
147e83 |
@@ -43,6 +43,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#define __arch_compare_and_exchange_bool_8_acq(mem, newval, oldval) \
|
|
|
147e83 |
(abort (), 0)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/m68k/coldfire/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/m68k/coldfire/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/m68k/coldfire/bits/atomic.h
|
|
|
147e83 |
@@ -49,6 +49,10 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+/* If we have just non-atomic operations, we can as well make them wide. */
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
/* The only basic operation needed is compare and exchange. */
|
|
|
147e83 |
#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
|
|
|
147e83 |
({ __typeof (mem) __gmemp = (mem); \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/m68k/m680x0/m68020/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/m68k/m680x0/m68020/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/m68k/m680x0/m68020/bits/atomic.h
|
|
|
147e83 |
@@ -44,6 +44,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
|
|
|
147e83 |
({ __typeof (*(mem)) __ret; \
|
|
|
147e83 |
__asm __volatile ("cas%.b %0,%2,%1" \
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/mips/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/mips/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/mips/bits/atomic.h
|
|
|
147e83 |
@@ -43,6 +43,12 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
#define MIPS_PUSH_MIPS2
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
+#if _MIPS_SIM == _ABIO32
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
+
|
|
|
147e83 |
/* See the comments in <sys/asm.h> about the use of the sync instruction. */
|
|
|
147e83 |
#ifndef MIPS_SYNC
|
|
|
147e83 |
# define MIPS_SYNC sync
|
|
|
147e83 |
@@ -82,6 +88,8 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
/* The __atomic_* builtins are available in GCC 4.7 and later, but MIPS
|
|
|
147e83 |
support for their efficient implementation was added only in GCC 4.8. */
|
|
|
147e83 |
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 1
|
|
|
147e83 |
+
|
|
|
147e83 |
/* Compare and exchange.
|
|
|
147e83 |
For all "bool" routines, we return FALSE if exchange succesful. */
|
|
|
147e83 |
|
|
|
147e83 |
@@ -204,6 +212,8 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
/* This implementation using inline assembly will be removed once glibc
|
|
|
147e83 |
requires GCC 4.8 or later to build. */
|
|
|
147e83 |
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
/* Compare and exchange. For all of the "xxx" routines, we expect a
|
|
|
147e83 |
"__prev" and a "__cmp" variable to be provided by the enclosing scope,
|
|
|
147e83 |
in which values are returned. */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc32/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc32/bits/atomic.h
|
|
|
147e83 |
@@ -33,6 +33,9 @@
|
|
|
147e83 |
# define MUTEX_HINT_REL
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
/*
|
|
|
147e83 |
* The 32-bit exchange_bool is different on powerpc64 because the subf
|
|
|
147e83 |
* does signed 64-bit arthmatic while the lwarx is 32-bit unsigned
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/powerpc/powerpc64/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/powerpc/powerpc64/bits/atomic.h
|
|
|
147e83 |
@@ -33,6 +33,9 @@
|
|
|
147e83 |
# define MUTEX_HINT_REL
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
/* The 32-bit exchange_bool is different on powerpc64 because the subf
|
|
|
147e83 |
does signed 64-bit arthmatic while the lwarx is 32-bit unsigned
|
|
|
147e83 |
(a load word and zero (high 32) form) load.
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/s390/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/s390/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/s390/bits/atomic.h
|
|
|
147e83 |
@@ -43,6 +43,8 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
|
|
|
147e83 |
(abort (), (__typeof (*mem)) 0)
|
|
|
147e83 |
@@ -59,6 +61,7 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
__archold; })
|
|
|
147e83 |
|
|
|
147e83 |
#ifdef __s390x__
|
|
|
147e83 |
+# define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
|
|
|
147e83 |
({ __typeof (mem) __archmem = (mem); \
|
|
|
147e83 |
__typeof (*mem) __archold = (oldval); \
|
|
|
147e83 |
@@ -67,6 +70,7 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
: "d" ((long) (newval)), "m" (*__archmem) : "cc", "memory" ); \
|
|
|
147e83 |
__archold; })
|
|
|
147e83 |
#else
|
|
|
147e83 |
+# define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
/* For 31 bit we do not really need 64-bit compare-and-exchange. We can
|
|
|
147e83 |
implement them by use of the csd instruction. The straightforward
|
|
|
147e83 |
implementation causes warnings so we skip the definition for now. */
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/sparc/sparc32/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/sparc/sparc32/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/sparc/sparc32/bits/atomic.h
|
|
|
147e83 |
@@ -47,6 +47,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
/* We have no compare and swap, just test and set.
|
|
|
147e83 |
The following implementation contends on 64 global locks
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/sparc/sparc32/sparcv9/bits/atomic.h
|
|
|
147e83 |
@@ -44,6 +44,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
|
|
|
147e83 |
(abort (), (__typeof (*mem)) 0)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/sparc/sparc64/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/sparc/sparc64/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/sparc/sparc64/bits/atomic.h
|
|
|
147e83 |
@@ -44,6 +44,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
|
|
|
147e83 |
#define __arch_compare_and_exchange_val_8_acq(mem, newval, oldval) \
|
|
|
147e83 |
(abort (), (__typeof (*mem)) 0)
|
|
|
147e83 |
Index: glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/ports/sysdeps/unix/sysv/linux/hppa/bits/atomic.h
|
|
|
147e83 |
@@ -44,6 +44,9 @@ typedef uintptr_t uatomicptr_t;
|
|
|
147e83 |
typedef intmax_t atomic_max_t;
|
|
|
147e83 |
typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 0
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+
|
|
|
147e83 |
/* prev = *addr;
|
|
|
147e83 |
if (prev == old)
|
|
|
147e83 |
*addr = new;
|
|
|
147e83 |
Index: glibc-2.17-c758a686/sysdeps/x86_64/bits/atomic.h
|
|
|
147e83 |
===================================================================
|
|
|
147e83 |
--- glibc-2.17-c758a686.orig/sysdeps/x86_64/bits/atomic.h
|
|
|
147e83 |
+++ glibc-2.17-c758a686/sysdeps/x86_64/bits/atomic.h
|
|
|
147e83 |
@@ -55,6 +55,12 @@ typedef uintmax_t uatomic_max_t;
|
|
|
147e83 |
# endif
|
|
|
147e83 |
#endif
|
|
|
147e83 |
|
|
|
147e83 |
+#define __HAVE_64B_ATOMICS 1
|
|
|
147e83 |
+#if __GNUC_PREREQ (4, 7)
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 1
|
|
|
147e83 |
+#else
|
|
|
147e83 |
+#define USE_ATOMIC_COMPILER_BUILTINS 0
|
|
|
147e83 |
+#endif
|
|
|
147e83 |
|
|
|
147e83 |
#define atomic_compare_and_exchange_val_acq(mem, newval, oldval) \
|
|
|
147e83 |
__sync_val_compare_and_swap (mem, oldval, newval)
|