Update.

2003-07-02  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Protect new_sysinfo
	decl and use with #ifdef NEED_DL_SYSINFO.

diff --git a/ChangeLog b/ChangeLog
index 346ed27cf57235c400417c6857999dc70befac97..dca87c988bc2ec4d03477be66a0f9a3c3c5df429 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-02  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Protect new_sysinfo
+       decl and use with #ifdef NEED_DL_SYSINFO.
+
 2003-07-02  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Don't set

diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 89dda27925758c18f578e5269ba4fd562b4d5b77..df5d3431dfcd53edf7d46466bbe2fa8e6025f85a 100644 (file)
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -93,7 +93,7 @@ _dl_sysdep_start (void **start_argptr,
 #  define set_seen(tag) seen |= M ((tag)->a_type)
 # endif
 #endif
-#ifndef __ASSUME_VSYSCALL
+#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
   ElfW(Word) new_sysinfo = 0;
 #endif
 
@@ -193,7 +193,7 @@ _dl_sysdep_start (void **start_argptr,
     GL(dl_pagesize) = __getpagesize ();
 #endif
 
-#ifndef __ASSUME_VSYSCALL
+#if defined NEED_DL_SYSINFO && !defined __ASSUME_VSYSCALL
   /* Only set the sysinfo value if we also have the vsyscall DSO.  */
   if (GL(dl_sysinfo_dso) != 0)
     GL(dl_sysinfo) = new_sysinfo;