aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--elf/rtld.c9
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 703a10a..5d57a17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,16 @@
2005-09-29 Roland McGrath <roland@redhat.com>
[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]
* posix/sys/wait.h (__WAIT_INT): Rewrite using an initializer,
in case __typeof yields a const-qualified type.
diff --git a/elf/rtld.c b/elf/rtld.c
index 21365af..a89f89b 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
{