diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-init.c | 8 | ||||
| -rw-r--r-- | elf/dl-writev.h | 2 | ||||
| -rw-r--r-- | elf/rtld.c | 4 |
3 files changed, 4 insertions, 10 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 } diff --git a/elf/dl-writev.h b/elf/dl-writev.h index a5ce6c5..6eace99 100644 --- a/elf/dl-writev.h +++ b/elf/dl-writev.h @@ -42,7 +42,7 @@ _dl_writev (int fd, const struct iovec *iov, size_t niov) errno when it's being used by another thread that cares about it. Yet we must be sure not to try calling the lock functions before the thread library is fully initialized. */ - if (__glibc_unlikely (INTUSE (_dl_starting_up))) + if (__glibc_unlikely (_dl_starting_up)) __writev (fd, iov, niov); else { @@ -116,7 +116,7 @@ static struct audit_list and will be since that dynamic linker's _dl_start and dl_main will never be called. */ int _dl_starting_up = 0; -INTVARDEF(_dl_starting_up) +rtld_hidden_def (_dl_starting_up) #endif /* This is the structure which defines all variables global to ld.so @@ -778,7 +778,7 @@ dl_main (const ElfW(Phdr) *phdr, #ifndef HAVE_INLINED_SYSCALLS /* Set up a flag which tells we are just starting. */ - INTUSE(_dl_starting_up) = 1; + _dl_starting_up = 1; #endif if (*user_entry == (ElfW(Addr)) ENTRY_POINT) |