diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-07-09 20:09:14 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-07-09 20:09:14 +0200 |
| commit | 7c241325d67af9e24ff03d4c6f6280c17ea181f8 (patch) | |
| tree | 5667f94ae80c6e75dc1bac29ab4c51d48cfad084 /nptl | |
| parent | dc76a059fded7a203c82dbb91d4fc1f43d3250db (diff) | |
| download | glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.gz glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.tar.xz glibc-7c241325d67af9e24ff03d4c6f6280c17ea181f8.zip | |
Force building with -fno-common
As a result, is not necessary to specify __attribute__ ((nocommon)) on individual definitions. GCC 10 defaults to -fno-common on all architectures except ARC, but this change is compatible with older GCC versions and ARC, too. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/libc_multiple_threads.c | 2 | ||||
| -rw-r--r-- | nptl/lowlevellock.c | 2 | ||||
| -rw-r--r-- | nptl/pthread_create.c | 4 | ||||
| -rw-r--r-- | nptl/pthread_keys.c | 3 | ||||
| -rw-r--r-- | nptl/vars.c | 6 |
5 files changed, 7 insertions, 10 deletions
diff --git a/nptl/libc_multiple_threads.c b/nptl/libc_multiple_threads.c index a0e7932c26..4eeec856ad 100644 --- a/nptl/libc_multiple_threads.c +++ b/nptl/libc_multiple_threads.c @@ -23,7 +23,7 @@ /* Variable set to a nonzero value either if more than one thread runs or ran, or if a single-threaded process is trying to cancel itself. See nptl/descr.h for more context on the single-threaded process case. */ -int __libc_multiple_threads __attribute__ ((nocommon)); +int __libc_multiple_threads; libc_hidden_data_def (__libc_multiple_threads) # endif #endif diff --git a/nptl/lowlevellock.c b/nptl/lowlevellock.c index 4f88178964..9dccc9889e 100644 --- a/nptl/lowlevellock.c +++ b/nptl/lowlevellock.c @@ -67,6 +67,6 @@ __lll_lock_wake (int *futex, int private) libc_hidden_def (__lll_lock_wake) #if ENABLE_ELISION_SUPPORT -int __pthread_force_elision __attribute__ ((nocommon)); +int __pthread_force_elision; libc_hidden_data_def (__pthread_force_elision) #endif diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index d1b6817a81..440adc2a6f 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -43,12 +43,12 @@ /* Globally enabled events. */ -td_thr_events_t __nptl_threads_events __attribute__ ((nocommon)); +td_thr_events_t __nptl_threads_events; libc_hidden_proto (__nptl_threads_events) libc_hidden_data_def (__nptl_threads_events) /* Pointer to descriptor with the last event. */ -struct pthread *__nptl_last_event __attribute__ ((nocommon)); +struct pthread *__nptl_last_event; libc_hidden_proto (__nptl_last_event) libc_hidden_data_def (__nptl_last_event) diff --git a/nptl/pthread_keys.c b/nptl/pthread_keys.c index 76e4cfad34..d7bbdd9af7 100644 --- a/nptl/pthread_keys.c +++ b/nptl/pthread_keys.c @@ -19,6 +19,5 @@ #include <pthreadP.h> /* Table of the key information. */ -struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX] - __attribute__ ((nocommon)); +struct pthread_key_struct __pthread_keys[PTHREAD_KEYS_MAX]; libc_hidden_data_def (__pthread_keys) diff --git a/nptl/vars.c b/nptl/vars.c index 989d7930e0..c3ec368b1b 100644 --- a/nptl/vars.c +++ b/nptl/vars.c @@ -22,11 +22,9 @@ /* Default thread attributes for the case when the user does not provide any. */ -union pthread_attr_transparent __default_pthread_attr - __attribute__ ((nocommon)); +union pthread_attr_transparent __default_pthread_attr; libc_hidden_data_def (__default_pthread_attr) /* Mutex protecting __default_pthread_attr. */ -int __default_pthread_attr_lock __attribute__ ((nocommon)) - = LLL_LOCK_INITIALIZER; +int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER; libc_hidden_data_def (__default_pthread_attr_lock) |