diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-05 23:35:36 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-05 23:35:36 +0000 |
| commit | 9cf27b8d09aab26bd4693b10f281d64da779da83 (patch) | |
| tree | ac2dcd53b3b9d58688d27d67f0e9afb9697ec517 /sysdeps | |
| parent | af83568d3fdc84884378317504b4a2b76371bf8b (diff) | |
| download | glibc-9cf27b8d09aab26bd4693b10f281d64da779da83.tar.gz glibc-9cf27b8d09aab26bd4693b10f281d64da779da83.tar.xz glibc-9cf27b8d09aab26bd4693b10f281d64da779da83.zip | |
Remove INTDEF / INTUSE / INTVARDEF (bug 14132).
Completing the removal of the obsolete INTDEF / INTUSE mechanism, this patch removes the final use - that for _dl_starting_up - replacing it by rtld_hidden_def / rtld_hidden_proto. Having removed the last use, the mechanism itself is also removed. Tested for x86_64 that installed stripped shared libraries are unchanged by the patch. (This is not much of a test since this variable is only defined and used in the !HAVE_INLINED_SYSCALLS case.) [BZ #14132] * include/libc-symbols.h (INTUSE): Remove macro. (INTDEF): Likewise. (INTVARDEF): Likewise. (_INTVARDEF): Likewise. (INTDEF2): Likewise. (INTVARDEF2): Likewise. * elf/rtld.c [!HAVE_INLINED_SYSCALLS] (_dl_starting_up): Use rtld_hidden_def instead of INTVARDEF. * sysdeps/generic/ldsodefs.h [IS_IN_rtld] (_dl_starting_up_internal): Remove declaration. (_dl_starting_up): Use rtld_hidden_proto. * elf/dl-init.c [!HAVE_INLINED_SYSCALLS] (_dl_starting_up): Remove declaration. [!HAVE_INLINED_SYSCALLS] (_dl_starting_up_internal): Likewise. (_dl_init) [!HAVE_INLINED_SYSCALLS]: Don't use INTUSE with _dl_starting_up. * elf/dl-writev.h (_dl_writev): Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h [!HAVE_INLINED_SYSCALLS] (DL_STARTING_UP_DEF): Use __GI__dl_starting_up instead of _dl_starting_up_internal.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 4 | ||||
| -rw-r--r-- | sysdeps/powerpc/powerpc64/dl-machine.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index f339ee3db9..b91a97318e 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -659,9 +659,7 @@ extern unsigned int _dl_skip_args_internal attribute_hidden /* Flag set at startup and cleared when the last initializer has run. */ extern int _dl_starting_up; weak_extern (_dl_starting_up) -#ifdef IS_IN_rtld -extern int _dl_starting_up_internal attribute_hidden; -#endif +rtld_hidden_proto (_dl_starting_up) /* Random data provided by the kernel. */ extern void *_dl_random attribute_hidden attribute_relro; diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h index 3007e80f90..8811d5d400 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.h +++ b/sysdeps/powerpc/powerpc64/dl-machine.h @@ -126,7 +126,7 @@ elf_machine_dynamic (void) #else # define DL_STARTING_UP_DEF \ ".LC__dl_starting_up:\n" \ -" .tc _dl_starting_up_internal[TC],_dl_starting_up_internal\n" +" .tc __GI__dl_starting_up[TC],__GI__dl_starting_up\n" #endif |