diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-03-07 17:07:11 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2002-03-07 17:07:11 +0000 |
| commit | 3c0b5174ab8c52aa3e8b68939979946fea85bbd5 (patch) | |
| tree | 7fdbb3b79efe9406fb27506737e09c1df74ccf31 | |
| parent | f095b92f6f22470b964c589e49699e54ac846ad4 (diff) | |
revert changes made in rev. 1.17; closes pr # 1903. niklas@ ok.
| -rw-r--r-- | gnu/usr.bin/ld/rtld/rtld.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/gnu/usr.bin/ld/rtld/rtld.c b/gnu/usr.bin/ld/rtld/rtld.c index 0709ea4c414..f3a69a12b0e 100644 --- a/gnu/usr.bin/ld/rtld/rtld.c +++ b/gnu/usr.bin/ld/rtld/rtld.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld.c,v 1.21 2002/02/14 04:25:32 fgsch Exp $ */ +/* $OpenBSD: rtld.c,v 1.22 2002/03/07 17:07:10 fgsch Exp $ */ /* $NetBSD: rtld.c,v 1.43 1996/01/14 00:35:17 pk Exp $ */ /* * Copyright (c) 1993 Paul Kranenburg @@ -1119,10 +1119,10 @@ long binder(jsp) jmpslot_t *jsp; { - struct so_map *smp, *src_map; + struct so_map *smp, *src_map = NULL; long addr; char *sym; - struct nzlist *np = NULL; + struct nzlist *np; int index; /* @@ -1143,18 +1143,7 @@ binder(jsp) sym = LM_STRINGS(smp) + LM_SYMBOL(smp,RELOC_SYMBOL(&LM_REL(smp)[index]))->nz_strx; - /* - * If this is a call from a dlopen(3) object, try to resolve locally - * first - */ - if (LM_PRIVATE(smp)->spd_flags & RTLD_DL) { - src_map = smp; - np = lookup(sym, &src_map, 1); - } - if (np == NULL) { - src_map = NULL; - np = lookup(sym, &src_map, 1); - } + np = lookup(sym, &src_map, 1); if (np == NULL) errx(1, "Undefined symbol \"%s\" called from %s:%s at %#x", sym, main_progname, smp->som_path, jsp); |