From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 2 Jul 2003 17:29:35 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~481
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d8d57bca0b490f7c0f5c0c0e2fc23e9e8f25fb9;p=thirdparty%2Fglibc.git

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 346ed27cf57..dca87c988bc 100644
--- 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 89dda279257..df5d3431dfc 100644
--- 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;