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:53 +0200 |
| commit | 5633541d3b9a78fc5283af3a2f3e824126ef785a (patch) | |
| tree | 2e05b6c9b7c90fa49f9e2a5b65296b58c8a9d2c4 /nptl/sem_wait.c | |
| parent | 990c8ffd3a83232365f346413e394d4431875899 (diff) | |
| download | glibc-5633541d3b9a78fc5283af3a2f3e824126ef785a.tar.gz glibc-5633541d3b9a78fc5283af3a2f3e824126ef785a.tar.xz glibc-5633541d3b9a78fc5283af3a2f3e824126ef785a.zip | |
nptl: Move sem_trywait, sem_wait into libc
The symbols were moved using scripts/move-symbol-to-libc.py. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'nptl/sem_wait.c')
| -rw-r--r-- | nptl/sem_wait.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c index 02bee9f98c..8576add41c 100644 --- a/nptl/sem_wait.c +++ b/nptl/sem_wait.c @@ -43,9 +43,13 @@ __new_sem_wait (sem_t *sem) return __new_sem_wait_slow64 ((struct new_sem *) sem, CLOCK_REALTIME, NULL); } -versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); +versioned_symbol (libc, __new_sem_wait, sem_wait, GLIBC_2_34); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1); +#endif + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) int attribute_compat_text_section __old_sem_wait (sem_t *sem) @@ -80,8 +84,13 @@ __new_sem_trywait (sem_t *sem) __set_errno (EAGAIN); return -1; } -versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1); -#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) +versioned_symbol (libc, __new_sem_trywait, sem_trywait, GLIBC_2_34); + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_1, GLIBC_2_34) +compat_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1); +#endif + +#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1) int __old_sem_trywait (sem_t *sem) { |