diff options
| author | Florian Weimer <fweimer@redhat.com> | 2024-12-19 21:28:50 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2024-12-19 21:29:58 +0100 |
| commit | e79b9e962dffa1dd293c4cc1f59d4cf08b6fa486 (patch) | |
| tree | 6fd5e68cc767eddff44e354d7e5ba5e092edf0a7 | |
| parent | 70d083630563831e7069ad412cd3ab0b33638e92 (diff) | |
| download | glibc-e79b9e962dffa1dd293c4cc1f59d4cf08b6fa486.tar.xz glibc-e79b9e962dffa1dd293c4cc1f59d4cf08b6fa486.zip | |
elf: Remove code dependent on __rtld_lock_default_lock_recursive macro
Neither NPTL nor Hurd define this macro anymore.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | elf/dl-tls_init_tp.c | 21 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 6 |
2 files changed, 0 insertions, 27 deletions
diff --git a/elf/dl-tls_init_tp.c b/elf/dl-tls_init_tp.c index f180d16b50..4c3ca3dc4b 100644 --- a/elf/dl-tls_init_tp.c +++ b/elf/dl-tls_init_tp.c @@ -18,33 +18,12 @@ #include <ldsodefs.h> -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive -static void -rtld_lock_default_lock_recursive (void *lock) -{ - __rtld_lock_default_lock_recursive (lock); -} - -static void -rtld_lock_default_unlock_recursive (void *lock) -{ - __rtld_lock_default_unlock_recursive (lock); -} -#endif - void __tls_pre_init_tp (void) { #if !PTHREAD_IN_LIBC GL(dl_init_static_tls) = &_dl_nothread_init_static_tls; #endif - -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive - GL(dl_rtld_lock_recursive) = rtld_lock_default_lock_recursive; - GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; -#endif } void diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 91447a5e77..384640b734 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -400,12 +400,6 @@ struct rtld_global struct auditstate _dl_rtld_auditstate[DL_NNS]; #endif -#if !PTHREAD_IN_LIBC && defined SHARED \ - && defined __rtld_lock_default_lock_recursive - EXTERN void (*_dl_rtld_lock_recursive) (void *); - EXTERN void (*_dl_rtld_unlock_recursive) (void *); -#endif - /* Get architecture specific definitions. */ #define PROCINFO_DECL #ifndef PROCINFO_CLASS |