From 22aa06a56236f7309a1261812b164388ed0cbc01 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 29 Sep 2005 22:03:45 +0000 Subject: [PATCH] [BZ #1392] * posix/sys/wait.h [!__GNUC__ || __cplusplus] (__WAIT_INT): Use const. 2005-09-29 Alfred M. Szmidt * elf/rtld.c [! DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args): Don't use attribute_relro. 2005-09-29 Roland McGrath [BZ #1392] --- ChangeLog | 10 ++++++++++ elf/rtld.c | 9 +++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 703a10ad75..5d57a1716a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-09-29 Roland McGrath + + [BZ #1392] + * posix/sys/wait.h [!__GNUC__ || __cplusplus] (__WAIT_INT): Use const. + +2005-09-29 Alfred M. Szmidt + + * elf/rtld.c [! DL_ARGV_NOT_RELRO] (_dl_argc, _dl_skip_args): + Don't use attribute_relro. + 2005-09-29 Roland McGrath [BZ #1392] 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 {