aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-sym.c
diff options
context:
space:
mode:
Diffstat (limited to 'elf/dl-sym.c')
-rw-r--r--elf/dl-sym.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 85d084f7f7..b0db159aa6 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -1,5 +1,5 @@
/* Look up a symbol in a shared object loaded by `dlopen'.
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -37,10 +37,10 @@ _dl_sym (void *handle, const char *name, void *who)
/* If the address is not recognized the call comes from the main
program (we hope). */
- match = _dl_loaded;
+ match = GL(dl_loaded);
/* Find the highest-addressed object that CALLER is not below. */
- for (l = _dl_loaded; l != NULL; l = l->l_next)
+ for (l = GL(dl_loaded); l != NULL; l = l->l_next)
if (caller >= l->l_map_start && caller < l->l_map_end)
{
/* There must be exactly one DSO for the range of the virtual
@@ -64,11 +64,11 @@ _dl_sym (void *handle, const char *name, void *who)
}
else
{
- if (__builtin_expect (match == _dl_loaded, 0))
+ if (__builtin_expect (match == GL(dl_loaded), 0))
{
- if (! _dl_loaded
- || caller < _dl_loaded->l_map_start
- || caller >= _dl_loaded->l_map_end)
+ if (! GL(dl_loaded)
+ || caller < GL(dl_loaded)->l_map_start
+ || caller >= GL(dl_loaded)->l_map_end)
_dl_signal_error (0, NULL, NULL, N_("\
RTLD_NEXT used in code not dynamically loaded"));
}
@@ -108,10 +108,10 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
/* If the address is not recognized the call comes from the main
program (we hope). */
- match = _dl_loaded;
+ match = GL(dl_loaded);
/* Find the highest-addressed object that CALLER is not below. */
- for (l = _dl_loaded; l != NULL; l = l->l_next)
+ for (l = GL(dl_loaded); l != NULL; l = l->l_next)
if (caller >= l->l_map_start && caller < l->l_map_end)
{
/* There must be exactly one DSO for the range of the virtual
@@ -126,11 +126,11 @@ _dl_vsym (void *handle, const char *name, const char *version, void *who)
&vers, 0, 0);
else if (handle == RTLD_NEXT)
{
- if (__builtin_expect (match == _dl_loaded, 0))
+ if (__builtin_expect (match == GL(dl_loaded), 0))
{
- if (! _dl_loaded
- || caller < _dl_loaded->l_map_start
- || caller >= _dl_loaded->l_map_end)
+ if (! GL(dl_loaded)
+ || caller < GL(dl_loaded)->l_map_start
+ || caller >= GL(dl_loaded)->l_map_end)
_dl_signal_error (0, NULL, NULL, N_("\
RTLD_NEXT used in code not dynamically loaded"));
}