diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:15:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-05-05 17:19:50 +0200 |
| commit | 990c8ffd3a83232365f346413e394d4431875899 (patch) | |
| tree | 24b41f70bcee7f885eca1d8ff50f44f0b0aea9e1 /nptl | |
| parent | 018c75dcb1ee93f3ff0d3d9cbdf1fe48aa630315 (diff) | |
| download | glibc-990c8ffd3a83232365f346413e394d4431875899.zip glibc-990c8ffd3a83232365f346413e394d4431875899.tar.gz glibc-990c8ffd3a83232365f346413e394d4431875899.tar.bz2 | |
nptl: Move sem_unlink into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
A small adjust to the sem_unlink implementation is necessary to avoid
a check-localplt failure.
A placeholder symbol to keep the GLIBC_2.1.1 version alive in
libpthread is added with this commit.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 4 | ||||
| -rw-r--r-- | nptl/libpthread-compat.c | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 9f73cf2..665cd1f 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -159,6 +159,7 @@ routines = \ sem_post \ sem_routines \ sem_timedwait \ + sem_unlink \ tpp \ unwind \ @@ -210,7 +211,6 @@ libpthread-routines = \ pthread_sigqueue \ pthread_timedjoin \ pthread_tryjoin \ - sem_unlink \ sem_wait \ vars \ version \ diff --git a/nptl/Versions b/nptl/Versions index f19c235..20997aa 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -92,6 +92,7 @@ libc { GLIBC_2.1.1 { sem_close; sem_open; + sem_unlink; } GLIBC_2.2 { __pthread_rwlock_destroy; @@ -269,6 +270,7 @@ libc { sem_open; sem_post; sem_timedwait; + sem_unlink; thrd_exit; tss_create; tss_delete; @@ -353,7 +355,7 @@ libpthread { } GLIBC_2.1.1 { - sem_unlink; + __libpthread_version_placeholder; } GLIBC_2.1.2 { diff --git a/nptl/libpthread-compat.c b/nptl/libpthread-compat.c index 7b0427a..401fa6a 100644 --- a/nptl/libpthread-compat.c +++ b/nptl/libpthread-compat.c @@ -36,6 +36,10 @@ __libpthread_version_placeholder_1 (void) version or later, the placeholder symbol is not needed because there are plenty of other symbols which populate those later versions. */ +#if (SHLIB_COMPAT (libpthread, GLIBC_2_1_1, GLIBC_2_1_2)) +compat_symbol (libpthread, __libpthread_version_placeholder_1, + __libpthread_version_placeholder, GLIBC_2_1_1); +#endif #if (SHLIB_COMPAT (libpthread, GLIBC_2_1_2, GLIBC_2_2)) compat_symbol (libpthread, __libpthread_version_placeholder_1, __libpthread_version_placeholder, GLIBC_2_1_2); |