summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-07-02 17:29:35 +0000
committerUlrich Drepper <drepper@redhat.com>2003-07-02 17:29:35 +0000
commit6d8d57bca0b490f7c0f5c0c0e2fc23e9e8f25fb9 (patch)
tree68d0afa0e39c7cf412f57efb79e17d29968ac0b9
parentfcdac13afa00ec69b306669106fd6f30055a56ac (diff)
downloadglibc-6d8d57bca0b490f7c0f5c0c0e2fc23e9e8f25fb9.tar.gz
glibc-6d8d57bca0b490f7c0f5c0c0e2fc23e9e8f25fb9.tar.xz
glibc-6d8d57bca0b490f7c0f5c0c0e2fc23e9e8f25fb9.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/generic/dl-sysdep.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 346ed27cf5..dca87c988b 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 89dda27925..df5d3431df 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;