aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--elf/dlsym.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index eaae358c86..288513f197 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 6 16:20:14 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
+
+ * elf/dlsym.c: Return the proper value, not just the defining
+ object's loadbase.
+
Sun Nov 5 16:09:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* stdio-common/vfprintf.c (%c): Count the character itself towards
diff --git a/elf/dlsym.c b/elf/dlsym.c
index 40ed850f64..8277ca3c13 100644
--- a/elf/dlsym.c
+++ b/elf/dlsym.c
@@ -28,12 +28,12 @@ dlsym (void *handle, const char *name)
{
struct link_map *map = handle;
struct link_map *real_next;
- Elf32_Addr value;
+ Elf32_Addr loadbase;
int lose;
void doit (void)
{
const Elf32_Sym *ref = NULL;
- value = _dl_lookup_symbol (name, &ref, map, map->l_name, 1);
+ loadbase = _dl_lookup_symbol (name, &ref, map, map->l_name, 1);
}
/* Confine the symbol scope to just this map. */
@@ -42,5 +42,5 @@ dlsym (void *handle, const char *name)
lose = _dlerror_run (doit);
map->l_next = real_next;
- return lose ? NULL : (void *) value;
+ return lose ? NULL : (void *) (loadbase + ref->st_value);
}