@@ -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
}
@@ -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)
@@ -391,26 +391,6 @@ for linking")
#define attribute_relro __attribute__ ((section (".data.rel.ro")))
-/* Handling on non-exported internal names. We have to do this only
- for shared code. */
-#ifdef SHARED
-# define INTUSE(name) name##_internal
-# define INTDEF(name) strong_alias (name, name##_internal)
-# define INTVARDEF(name) \
- _INTVARDEF (name, name##_internal)
-# define _INTVARDEF(name, aliasname) \
- extern __typeof (name) aliasname __attribute__ ((alias (#name), \
- visibility ("hidden")));
-# define INTDEF2(name, newname) strong_alias (name, newname##_internal)
-# define INTVARDEF2(name, newname) _INTVARDEF (name, newname##_internal)
-#else
-# define INTUSE(name) name
-# define INTDEF(name)
-# define INTVARDEF(name)
-# define INTDEF2(name, newname)
-# define INTVARDEF2(name, newname)
-#endif
-
/* The following macros are used for PLT bypassing within libc.so
(and if needed other libraries similarly).
First of all, you need to have the function prototyped somewhere,
@@ -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;
@@ -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