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:40 +0200 |
| commit | 4b729cca87ea2f14bcb526588f992cdd931ef362 (patch) | |
| tree | 00e802d8ab4fe80ed9031c0756d93908c8bf1b51 /nptl | |
| parent | 0b7d48d1062e4383b4a78e0bb78c5f0f29479780 (diff) | |
| download | glibc-4b729cca87ea2f14bcb526588f992cdd931ef362.tar glibc-4b729cca87ea2f14bcb526588f992cdd931ef362.tar.gz glibc-4b729cca87ea2f14bcb526588f992cdd931ef362.tar.bz2 glibc-4b729cca87ea2f14bcb526588f992cdd931ef362.zip | |
nptl: Move sem_destroy into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 2 | ||||
| -rw-r--r-- | nptl/Versions | 5 | ||||
| -rw-r--r-- | nptl/sem_destroy.c | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index ab24222c1d..f8416b240c 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -152,6 +152,7 @@ routines = \ pthread_yield \ sem_clockwait \ sem_close \ + sem_destroy \ sem_open \ sem_routines \ tpp \ @@ -205,7 +206,6 @@ libpthread-routines = \ pthread_sigqueue \ pthread_timedjoin \ pthread_tryjoin \ - sem_destroy \ sem_getvalue \ sem_init \ sem_post \ diff --git a/nptl/Versions b/nptl/Versions index 4a9e5a0305..c59bbd8736 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -62,6 +62,7 @@ libc { pthread_setspecific; pthread_sigmask; pthread_testcancel; + sem_destroy; } GLIBC_2.1 { pthread_attr_init; @@ -80,6 +81,7 @@ libc { pthread_rwlockattr_init; pthread_rwlockattr_setkind_np; pthread_rwlockattr_setpshared; + sem_destroy; } GLIBC_2.1.1 { sem_close; @@ -254,6 +256,7 @@ libc { pthread_testcancel; sem_clockwait; sem_close; + sem_destroy; sem_open; thrd_exit; tss_create; @@ -320,7 +323,6 @@ libpthread { pthread_detach; pthread_join; pthread_sigmask; - sem_destroy; sem_getvalue; sem_init; sem_post; @@ -338,7 +340,6 @@ libpthread { pthread_create; pthread_getconcurrency; pthread_setconcurrency; - sem_destroy; sem_getvalue; sem_init; sem_post; diff --git a/nptl/sem_destroy.c b/nptl/sem_destroy.c index 3a105e9c65..fd8f2024ce 100644 --- a/nptl/sem_destroy.c +++ b/nptl/sem_destroy.c @@ -29,8 +29,11 @@ __new_sem_destroy (sem_t *sem) /* Nothing to do. */ return 0; } -versioned_symbol (libpthread, __new_sem_destroy, sem_destroy, GLIBC_2_1); -#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) +versioned_symbol (libc, __new_sem_destroy, sem_destroy, GLIBC_2_34); +#if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) strong_alias (__new_sem_destroy, __old_sem_destroy) compat_symbol (libpthread, __old_sem_destroy, sem_destroy, GLIBC_2_0); #endif +#if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __new_sem_destroy, sem_destroy, GLIBC_2_1); +#endif |