diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-22 16:02:59 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-22 16:02:59 +0200 |
| commit | 33b20249b567724664568fc6475b6f502c958be4 (patch) | |
| tree | 792cb137309c7a7c5ebca91bf21cf2c8b864c82c /nptl | |
| parent | f553dc066071a4465321fbc122bed8a75afd996b (diff) | |
| download | glibc-33b20249b567724664568fc6475b6f502c958be4.tar.gz | |
nptl: Move pthread_atfork compatibility symbol to libc
The symbol was moved using scripts/move-symbol-to-libc.py.
There is no new symbol version because of the compatibility symbol
status. The __pthread_atfork reference in nptl/Versions was unused.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 3 | ||||
| -rw-r--r-- | nptl/old_pthread_atfork.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 1978c491c9..103257dc74 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -47,6 +47,7 @@ routines = \ nptl_deallocate_tsd \ nptl_nthreads \ nptl_setxid \ + old_pthread_atfork \ old_pthread_cond_broadcast \ old_pthread_cond_destroy \ old_pthread_cond_init \ @@ -125,7 +126,6 @@ libpthread-routines = \ libpthread-compat \ nptl-init \ nptlfreeres \ - old_pthread_atfork \ pt-interp \ pthread_attr_getaffinity \ pthread_attr_getguardsize \ diff --git a/nptl/Versions b/nptl/Versions index bb9f5e4ca7..cf4815ea25 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -12,6 +12,7 @@ libc { _pthread_cleanup_pop_restore; _pthread_cleanup_push; _pthread_cleanup_push_defer; + pthread_atfork; pthread_attr_destroy; pthread_attr_getdetachstate; pthread_attr_getinheritsched; @@ -185,7 +186,6 @@ libpthread { _IO_funlockfile; __errno_location; __h_errno_location; - __pthread_atfork; __pthread_mutex_trylock; __pthread_mutexattr_destroy; __pthread_mutexattr_init; @@ -194,7 +194,6 @@ libpthread { flockfile; ftrylockfile; funlockfile; - pthread_atfork; pthread_cancel; pthread_create; pthread_detach; diff --git a/nptl/old_pthread_atfork.c b/nptl/old_pthread_atfork.c index 01b7de633d..675227c559 100644 --- a/nptl/old_pthread_atfork.c +++ b/nptl/old_pthread_atfork.c @@ -18,7 +18,7 @@ #include <shlib-compat.h> -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_3) # define __pthread_atfork __dyn_pthread_atfork # include "pthread_atfork.c" # undef __pthread_atfork |