about summary refs log tree commit diff
path: root/sysdeps
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-03-01 14:44:44 -0800
committerRoland McGrath <roland@hack.frob.com>2013-03-01 14:44:44 -0800
commit7775448e570a2bd77886548fc3e9af5007814a8b (patch)
tree72e6ee8881f2d600d6f89cc02c55072246e63ea8 /sysdeps
parent4e9b5995775c99e029ed4003aaddb88bfbf8e2cd (diff)
downloadglibc-7775448e570a2bd77886548fc3e9af5007814a8b.tar.gz
glibc-7775448e570a2bd77886548fc3e9af5007814a8b.tar.xz
glibc-7775448e570a2bd77886548fc3e9af5007814a8b.zip
Fix NEED_DL_SYSINFO_DSO conditionals.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/ldsodefs.h2
-rw-r--r--sysdeps/unix/sysv/linux/dl-sysdep.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 01a2712f33..408737afd8 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -538,7 +538,7 @@ struct rtld_global_ro
   EXTERN uintptr_t _dl_sysinfo;
 #endif
 
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+#ifdef NEED_DL_SYSINFO_DSO
   /* The vsyscall page is a virtual DSO pre-mapped by the kernel.
      This points to its ELF header.  */
   EXTERN const ElfW(Ehdr) *_dl_sysinfo_dso;
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c
index a4ca119d8b..e80cb8d9f0 100644
--- a/sysdeps/unix/sysv/linux/dl-sysdep.c
+++ b/sysdeps/unix/sysv/linux/dl-sysdep.c
@@ -43,7 +43,7 @@ int
 attribute_hidden
 _dl_discover_osversion (void)
 {
-#if (defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO) && defined SHARED
+#if defined NEED_DL_SYSINFO_DSO && defined SHARED
   if (GLRO(dl_sysinfo_map) != NULL)
     {
       /* If the kernel-supplied DSO contains a note indicating the kernel's