aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-init.c
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-11-05 23:35:36 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-11-05 23:35:36 +0000
commit9cf27b8d09aab26bd4693b10f281d64da779da83 (patch)
treeac2dcd53b3b9d58688d27d67f0e9afb9697ec517 /elf/dl-init.c
parentaf83568d3fdc84884378317504b4a2b76371bf8b (diff)
downloadglibc-9cf27b8d09aab26bd4693b10f281d64da779da83.zip
glibc-9cf27b8d09aab26bd4693b10f281d64da779da83.tar.gz
glibc-9cf27b8d09aab26bd4693b10f281d64da779da83.tar.bz2
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 'elf/dl-init.c')
-rw-r--r--elf/dl-init.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/elf/dl-init.c b/elf/dl-init.c
index e5ade47..c80ec64 100644
--- a/elf/dl-init.c
+++ b/elf/dl-init.c
@@ -23,12 +23,6 @@
/* Type of the initializer. */
typedef void (*init_t) (int, char **, char **);
-#ifndef HAVE_INLINED_SYSCALLS
-/* Flag, nonzero during startup phase. */
-extern int _dl_starting_up;
-extern int _dl_starting_up_internal attribute_hidden;
-#endif
-
static void
call_init (struct link_map *l, int argc, char **argv, char **env)
@@ -127,6 +121,6 @@ _dl_init (struct link_map *main_map, int argc, char **argv, char **env)
#ifndef HAVE_INLINED_SYSCALLS
/* Finished starting up. */
- INTUSE(_dl_starting_up) = 0;
+ _dl_starting_up = 0;
#endif
}