aboutsummaryrefslogtreecommitdiff
path: root/elf/rtld.c
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 /elf/rtld.c
parent4e9b5995775c99e029ed4003aaddb88bfbf8e2cd (diff)
downloadglibc-7775448e570a2bd77886548fc3e9af5007814a8b.zip
glibc-7775448e570a2bd77886548fc3e9af5007814a8b.tar.gz
glibc-7775448e570a2bd77886548fc3e9af5007814a8b.tar.bz2
Fix NEED_DL_SYSINFO_DSO conditionals.
Diffstat (limited to 'elf/rtld.c')
-rw-r--r--elf/rtld.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 4014ef1..23238ad 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1768,7 +1768,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
GL(dl_rtld_map).l_next = (i + 1 < main_map->l_searchlist.r_nlist
? main_map->l_searchlist.r_list[i + 1]
: NULL);
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+#ifdef NEED_DL_SYSINFO_DSO
if (GLRO(dl_sysinfo_map) != NULL
&& GL(dl_rtld_map).l_prev->l_next == GLRO(dl_sysinfo_map)
&& GL(dl_rtld_map).l_next != GLRO(dl_sysinfo_map))
@@ -1880,7 +1880,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
if (dyn->d_tag == DT_NEEDED)
{
l = l->l_next;
-#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
+#ifdef NEED_DL_SYSINFO_DSO
/* Skip the VDSO since it's not part of the list
of objects we brought in via DT_NEEDED entries. */
if (l == GLRO(dl_sysinfo_map))