aboutsummaryrefslogtreecommitdiff
path: root/elf/rtld.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2005-09-29 22:03:45 +0000
committerRoland McGrath <roland@gnu.org>2005-09-29 22:03:45 +0000
commit22aa06a56236f7309a1261812b164388ed0cbc01 (patch)
tree1b51c120d067d279f4a2715f53d2f48aab943b02 /elf/rtld.c
parentffc9bccd84c7779dc486ade4bd93960288f211fd (diff)
downloadglibc-22aa06a56236f7309a1261812b164388ed0cbc01.tar
glibc-22aa06a56236f7309a1261812b164388ed0cbc01.tar.gz
glibc-22aa06a56236f7309a1261812b164388ed0cbc01.tar.bz2
glibc-22aa06a56236f7309a1261812b164388ed0cbc01.zip
[BZ #1392]
* posix/sys/wait.h [!__GNUC__ || __cplusplus] (__WAIT_INT): Use const. 2005-09-29 Alfred M. Szmidt <ams@gnu.org> * elf/rtld.c [! DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args): Don't use attribute_relro. 2005-09-29 Roland McGrath <roland@redhat.com> [BZ #1392]
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 21365af2ba..a89f89b3a5 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -72,11 +72,15 @@ enum mode { normal, list, verify, trace };
all the entries. */
static void process_envvars (enum mode *modep);
-int _dl_argc attribute_relro attribute_hidden;
#ifdef DL_ARGV_NOT_RELRO
+int _dl_argc attribute_hidden;
char **_dl_argv = NULL;
+/* Nonzero if we were run directly. */
+unsigned int _dl_skip_args attribute_hidden;
#else
+int _dl_argc attribute_relro attribute_hidden;
char **_dl_argv attribute_relro = NULL;
+unsigned int _dl_skip_args attribute_relro attribute_hidden;
#endif
INTDEF(_dl_argv)
@@ -86,9 +90,6 @@ INTDEF(_dl_argv)
uintptr_t __stack_chk_guard attribute_relro;
#endif
-/* Nonzero if we were run directly. */
-unsigned int _dl_skip_args attribute_relro attribute_hidden;
-
/* List of auditing DSOs. */
static struct audit_list
{