about summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-05 11:25:26 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-05 11:25:26 +0000
commitdd70526e8a07e95336ee87e1d968deafa8b5f34c (patch)
tree7d58d3d136b61e8d5f4f865ebccbbe103f9f2f04 /elf
parentaa420660e08be0da12f473293db8f57e1bcdcc8d (diff)
downloadglibc-dd70526e8a07e95336ee87e1d968deafa8b5f34c.tar.gz
glibc-dd70526e8a07e95336ee87e1d968deafa8b5f34c.tar.xz
glibc-dd70526e8a07e95336ee87e1d968deafa8b5f34c.zip
Update.
	* sysdeps/generic/ldsodefs.h (struct rtld_global): Move
	dl_debug_fd to rtld_global_ro.
	* elf/rtld.c: Use GLRO instead of GL for dl_debug_fd.
	* elf/dl-misc.c: Likewise.
Diffstat (limited to 'elf')
-rw-r--r--elf/dl-misc.c4
-rw-r--r--elf/rtld.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/elf/dl-misc.c b/elf/dl-misc.c
index c5209fbce4..9b29bcf4cd 100644
--- a/elf/dl-misc.c
+++ b/elf/dl-misc.c
@@ -276,7 +276,7 @@ _dl_debug_printf (const char *fmt, ...)
   va_list arg;
 
   va_start (arg, fmt);
-  _dl_debug_vdprintf (GL(dl_debug_fd), 1, fmt, arg);
+  _dl_debug_vdprintf (GLRO(dl_debug_fd), 1, fmt, arg);
   va_end (arg);
 }
 INTDEF(_dl_debug_printf)
@@ -289,7 +289,7 @@ _dl_debug_printf_c (const char *fmt, ...)
   va_list arg;
 
   va_start (arg, fmt);
-  _dl_debug_vdprintf (GL(dl_debug_fd), -1, fmt, arg);
+  _dl_debug_vdprintf (GLRO(dl_debug_fd), -1, fmt, arg);
   va_end (arg);
 }
 
diff --git a/elf/rtld.c b/elf/rtld.c
index 943901f56b..c0e15a696c 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -94,7 +94,6 @@ struct rtld_global _rtld_global =
   {
     /* Get architecture specific initializer.  */
 #include <dl-procinfo.c>
-    ._dl_debug_fd = STDERR_FILENO,
     /* Default presumption without further information is executable stack.  */
     ._dl_stack_flags = PF_R|PF_W|PF_X,
 #ifdef _LIBC_REENTRANT
@@ -116,6 +115,7 @@ struct rtld_global_ro _rtld_global_ro attribute_relro =
 #ifdef NEED_DL_SYSINFO
     ._dl_sysinfo = DL_SYSINFO_DEFAULT,
 #endif
+    ._dl_debug_fd = STDERR_FILENO,
     ._dl_use_load_bias = -2,
     ._dl_correct_cache_id = _DL_CACHE_DEFAULT_ID,
     ._dl_hwcap_mask = HWCAP_IMPORTANT,
@@ -2190,10 +2190,10 @@ process_envvars (enum mode *modep)
       *--startp = '.';
       startp = memcpy (startp - name_len, debug_output, name_len);
 
-      GL(dl_debug_fd) = __open (startp, flags, DEFFILEMODE);
-      if (GL(dl_debug_fd) == -1)
+      GLRO(dl_debug_fd) = __open (startp, flags, DEFFILEMODE);
+      if (GLRO(dl_debug_fd) == -1)
 	/* We use standard output if opening the file failed.  */
-	GL(dl_debug_fd) = STDOUT_FILENO;
+	GLRO(dl_debug_fd) = STDOUT_FILENO;
     }
 }