aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorWilco Dijkstra <wdijkstr@arm.com>2022-09-26 16:58:08 +0100
committerWilco Dijkstra <wdijkstr@arm.com>2022-09-26 16:58:08 +0100
commit22f4ab2d200f605441cdd2b49ec9c97d43eb11c9 (patch)
tree900238f342a45d6c899cad578d58546336ffe5b9 /sysdeps
parentc02e29a0ba47d636281e1a026444a1a0a254aa12 (diff)
downloadglibc-22f4ab2d200f605441cdd2b49ec9c97d43eb11c9.tar
glibc-22f4ab2d200f605441cdd2b49ec9c97d43eb11c9.tar.gz
glibc-22f4ab2d200f605441cdd2b49ec9c97d43eb11c9.tar.bz2
glibc-22f4ab2d200f605441cdd2b49ec9c97d43eb11c9.zip
Use atomic_exchange_release/acquire
Rename atomic_exchange_rel/acq to use atomic_exchange_release/acquire since these map to the standard C11 atomic builtins. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/aarch64/nptl/tls.h2
-rw-r--r--sysdeps/alpha/nptl/tls.h2
-rw-r--r--sysdeps/arc/nptl/tls.h2
-rw-r--r--sysdeps/arm/nptl/tls.h2
-rw-r--r--sysdeps/csky/nptl/tls.h2
-rw-r--r--sysdeps/hppa/nptl/pthread_spin_init.c4
-rw-r--r--sysdeps/hppa/nptl/pthread_spin_unlock.c4
-rw-r--r--sysdeps/hppa/nptl/tls.h2
-rw-r--r--sysdeps/ia64/nptl/tls.h2
-rw-r--r--sysdeps/loongarch/nptl/tls.h4
-rw-r--r--sysdeps/m68k/nptl/tls.h2
-rw-r--r--sysdeps/microblaze/nptl/tls.h2
-rw-r--r--sysdeps/mips/nptl/tls.h2
-rw-r--r--sysdeps/nios2/nptl/tls.h2
-rw-r--r--sysdeps/nptl/futex-internal.h2
-rw-r--r--sysdeps/nptl/lowlevellock.h4
-rw-r--r--sysdeps/or1k/nptl/tls.h2
-rw-r--r--sysdeps/posix/libc_fatal.c4
-rw-r--r--sysdeps/powerpc/nptl/tls.h2
-rw-r--r--sysdeps/riscv/nptl/tls.h2
-rw-r--r--sysdeps/s390/nptl/tls.h2
-rw-r--r--sysdeps/sh/nptl/tls.h2
-rw-r--r--sysdeps/sparc/nptl/tls.h2
23 files changed, 28 insertions, 28 deletions
diff --git a/sysdeps/aarch64/nptl/tls.h b/sysdeps/aarch64/nptl/tls.h
index 8d62b31e23..08aa2eff89 100644
--- a/sysdeps/aarch64/nptl/tls.h
+++ b/sysdeps/aarch64/nptl/tls.h
@@ -98,7 +98,7 @@ typedef struct
# define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h
index ddf7de0705..8f5b69ad3b 100644
--- a/sysdeps/alpha/nptl/tls.h
+++ b/sysdeps/alpha/nptl/tls.h
@@ -95,7 +95,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/arc/nptl/tls.h b/sysdeps/arc/nptl/tls.h
index 15adfc9491..7fc6602b23 100644
--- a/sysdeps/arc/nptl/tls.h
+++ b/sysdeps/arc/nptl/tls.h
@@ -103,7 +103,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/arm/nptl/tls.h b/sysdeps/arm/nptl/tls.h
index 02d9be202d..7657ca3dcc 100644
--- a/sysdeps/arm/nptl/tls.h
+++ b/sysdeps/arm/nptl/tls.h
@@ -89,7 +89,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/csky/nptl/tls.h b/sysdeps/csky/nptl/tls.h
index cd135d5464..58d6ab0fb2 100644
--- a/sysdeps/csky/nptl/tls.h
+++ b/sysdeps/csky/nptl/tls.h
@@ -118,7 +118,7 @@ typedef struct
# define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/hppa/nptl/pthread_spin_init.c b/sysdeps/hppa/nptl/pthread_spin_init.c
index aca5e01fce..f2a2009daa 100644
--- a/sysdeps/hppa/nptl/pthread_spin_init.c
+++ b/sysdeps/hppa/nptl/pthread_spin_init.c
@@ -23,7 +23,7 @@ __pthread_spin_init (pthread_spinlock_t *lock, int pshared)
{
/* CONCURRENCTY NOTES:
- The atomic_exchange_rel synchronizes-with the atomic_exhange_acq in
+ The atomic_exchange_release synchronizes-with the atomic_exhange_acq in
pthread_spin_lock.
On hppa we must not use a plain `stw` to reset the guard lock. This
@@ -40,7 +40,7 @@ __pthread_spin_init (pthread_spinlock_t *lock, int pshared)
Therefore if a variable is used in an atomic macro it must always be
manipulated with atomic macros in order for memory ordering rules to
be preserved. */
- atomic_exchange_rel (lock, 0);
+ atomic_exchange_release (lock, 0);
return 0;
}
versioned_symbol (libc, __pthread_spin_init, pthread_spin_init,
diff --git a/sysdeps/hppa/nptl/pthread_spin_unlock.c b/sysdeps/hppa/nptl/pthread_spin_unlock.c
index 5639ec84ec..885ce2b2ba 100644
--- a/sysdeps/hppa/nptl/pthread_spin_unlock.c
+++ b/sysdeps/hppa/nptl/pthread_spin_unlock.c
@@ -23,7 +23,7 @@ __pthread_spin_unlock (pthread_spinlock_t *lock)
{
/* CONCURRENCTY NOTES:
- The atomic_exchange_rel synchronizes-with the atomic_exhange_acq in
+ The atomic_exchange_release synchronizes-with the atomic_exhange_acq in
pthread_spin_lock.
On hppa we must not use a plain `stw` to reset the guard lock. This
@@ -40,7 +40,7 @@ __pthread_spin_unlock (pthread_spinlock_t *lock)
Therefore if a variable is used in an atomic macro it must always be
manipulated with atomic macros in order for memory ordering rules to
be preserved. */
- atomic_exchange_rel (lock, 0);
+ atomic_exchange_release (lock, 0);
return 0;
}
versioned_symbol (libc, __pthread_spin_unlock, pthread_spin_unlock,
diff --git a/sysdeps/hppa/nptl/tls.h b/sysdeps/hppa/nptl/tls.h
index 204960d524..e6b0bd5c71 100644
--- a/sysdeps/hppa/nptl/tls.h
+++ b/sysdeps/hppa/nptl/tls.h
@@ -123,7 +123,7 @@ static inline void __set_cr27(struct pthread *cr27)
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/ia64/nptl/tls.h b/sysdeps/ia64/nptl/tls.h
index 8ccedb73e6..d2411b3c1a 100644
--- a/sysdeps/ia64/nptl/tls.h
+++ b/sysdeps/ia64/nptl/tls.h
@@ -147,7 +147,7 @@ register struct pthread *__thread_self __asm__("r13");
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/loongarch/nptl/tls.h b/sysdeps/loongarch/nptl/tls.h
index 3b271c4b60..24bffe3a0a 100644
--- a/sysdeps/loongarch/nptl/tls.h
+++ b/sysdeps/loongarch/nptl/tls.h
@@ -119,8 +119,8 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ \
- int __res = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
- THREAD_GSCOPE_FLAG_UNUSED); \
+ int __res = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
+ THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
} \
diff --git a/sysdeps/m68k/nptl/tls.h b/sysdeps/m68k/nptl/tls.h
index 30d58e36e9..742e1b6767 100644
--- a/sysdeps/m68k/nptl/tls.h
+++ b/sysdeps/m68k/nptl/tls.h
@@ -122,7 +122,7 @@ extern void * __m68k_read_tp (void);
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/microblaze/nptl/tls.h b/sysdeps/microblaze/nptl/tls.h
index 40a6acd71e..588fd1c5d6 100644
--- a/sysdeps/microblaze/nptl/tls.h
+++ b/sysdeps/microblaze/nptl/tls.h
@@ -100,7 +100,7 @@ typedef struct
# define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/mips/nptl/tls.h b/sysdeps/mips/nptl/tls.h
index 03a5b24abd..2aa7cb4bb8 100644
--- a/sysdeps/mips/nptl/tls.h
+++ b/sysdeps/mips/nptl/tls.h
@@ -150,7 +150,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/nios2/nptl/tls.h b/sysdeps/nios2/nptl/tls.h
index 18080275ef..cb231e2a4b 100644
--- a/sysdeps/nios2/nptl/tls.h
+++ b/sysdeps/nios2/nptl/tls.h
@@ -130,7 +130,7 @@ register struct pthread *__thread_self __asm__("r23");
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h
index cf54c27ed9..f64728b398 100644
--- a/sysdeps/nptl/futex-internal.h
+++ b/sysdeps/nptl/futex-internal.h
@@ -319,7 +319,7 @@ __futex_clocklock64 (int *futex, clockid_t clockid,
{
if (__glibc_unlikely (atomic_compare_and_exchange_bool_acq (futex, 1, 0)))
{
- while (atomic_exchange_acq (futex, 2) != 0)
+ while (atomic_exchange_acquire (futex, 2) != 0)
{
int err = 0;
err = __futex_abstimed_wait64 ((unsigned int *) futex, 2, clockid,
diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h
index b429d9aa78..29aa9adb89 100644
--- a/sysdeps/nptl/lowlevellock.h
+++ b/sysdeps/nptl/lowlevellock.h
@@ -119,7 +119,7 @@ libc_hidden_proto (__lll_lock_wait)
((void) \
({ \
int *__futex = (futex); \
- if (__glibc_unlikely (atomic_exchange_acq (__futex, 2) != 0)) \
+ if (__glibc_unlikely (atomic_exchange_acquire (__futex, 2) != 0)) \
__lll_lock_wait (__futex, private); \
}))
#define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private)
@@ -147,7 +147,7 @@ libc_hidden_proto (__lll_lock_wake)
({ \
int *__futex = (futex); \
int __private = (private); \
- int __oldval = atomic_exchange_rel (__futex, 0); \
+ int __oldval = atomic_exchange_release (__futex, 0); \
if (__glibc_unlikely (__oldval > 1)) \
{ \
if (__builtin_constant_p (private) && (private) == LLL_PRIVATE) \
diff --git a/sysdeps/or1k/nptl/tls.h b/sysdeps/or1k/nptl/tls.h
index c6ffe62c3f..e82f444738 100644
--- a/sysdeps/or1k/nptl/tls.h
+++ b/sysdeps/or1k/nptl/tls.h
@@ -164,7 +164,7 @@ register tcbhead_t *__thread_self __asm__("r10");
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ \
- int __res = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag,\
+ int __res = atomic_exchange_release (&THREAD_SELF->header.gscope_flag,\
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, \
diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c
index 270238495d..e8e582e0cf 100644
--- a/sysdeps/posix/libc_fatal.c
+++ b/sysdeps/posix/libc_fatal.c
@@ -137,8 +137,8 @@ __libc_message (const char *fmt, ...)
/* We have to free the old buffer since the application might
catch the SIGABRT signal. */
- struct abort_msg_s *old = atomic_exchange_acq (&__abort_msg,
- buf);
+ struct abort_msg_s *old = atomic_exchange_acquire (&__abort_msg,
+ buf);
if (old != NULL)
__munmap (old, old->size);
}
diff --git a/sysdeps/powerpc/nptl/tls.h b/sysdeps/powerpc/nptl/tls.h
index 22b0075235..e62a96238a 100644
--- a/sysdeps/powerpc/nptl/tls.h
+++ b/sysdeps/powerpc/nptl/tls.h
@@ -214,7 +214,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/riscv/nptl/tls.h b/sysdeps/riscv/nptl/tls.h
index 4e586f348a..700c2f5189 100644
--- a/sysdeps/riscv/nptl/tls.h
+++ b/sysdeps/riscv/nptl/tls.h
@@ -113,7 +113,7 @@ typedef struct
# define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/s390/nptl/tls.h b/sysdeps/s390/nptl/tls.h
index ff210ffeb2..98d7870148 100644
--- a/sysdeps/s390/nptl/tls.h
+++ b/sysdeps/s390/nptl/tls.h
@@ -157,7 +157,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/sh/nptl/tls.h b/sysdeps/sh/nptl/tls.h
index 76591ab6ef..1530489a6c 100644
--- a/sysdeps/sh/nptl/tls.h
+++ b/sysdeps/sh/nptl/tls.h
@@ -129,7 +129,7 @@ typedef struct
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \
diff --git a/sysdeps/sparc/nptl/tls.h b/sysdeps/sparc/nptl/tls.h
index d1e2bb4ad1..95a69cb824 100644
--- a/sysdeps/sparc/nptl/tls.h
+++ b/sysdeps/sparc/nptl/tls.h
@@ -130,7 +130,7 @@ register struct pthread *__thread_self __asm__("%g7");
#define THREAD_GSCOPE_RESET_FLAG() \
do \
{ int __res \
- = atomic_exchange_rel (&THREAD_SELF->header.gscope_flag, \
+ = atomic_exchange_release (&THREAD_SELF->header.gscope_flag, \
THREAD_GSCOPE_FLAG_UNUSED); \
if (__res == THREAD_GSCOPE_FLAG_WAIT) \
lll_futex_wake (&THREAD_SELF->header.gscope_flag, 1, LLL_PRIVATE); \