diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-06 00:16:54 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-04-06 00:16:54 +0000 |
| commit | 97b5dbcee340f2c57bc7189ecfe7c93337e29007 (patch) | |
| tree | 221b9c2493747769edb7397bf5c666ea4a8962de /libexec/ld.so/resolve.c | |
| parent | 6119f0701e2a8cb66ce05c15007eb7c8185c117b (diff) | |
backout -- breaks at least amd64; spotted by marc
Diffstat (limited to 'libexec/ld.so/resolve.c')
| -rw-r--r-- | libexec/ld.so/resolve.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libexec/ld.so/resolve.c b/libexec/ld.so/resolve.c index 8dfcbac48b0..26a9f46b68c 100644 --- a/libexec/ld.so/resolve.c +++ b/libexec/ld.so/resolve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.c,v 1.25 2005/04/05 19:29:09 drahn Exp $ */ +/* $OpenBSD: resolve.c,v 1.26 2005/04/06 00:16:53 deraadt Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -187,9 +187,8 @@ _dl_lookup_object(const char *name) return(0); } -int _dl_find_symbol_obj(elf_object_t *object, const char *name, - unsigned long hash, int flags, const Elf_Sym **ref, - const Elf_Sym **weak_sym, +int find_symbol_obj(elf_object_t *object, const char *name, unsigned long hash, + int flags, const Elf_Sym **ref, const Elf_Sym **weak_sym, elf_object_t **weak_object); sym_cache *_dl_symcache; @@ -262,7 +261,7 @@ _dl_find_symbol(const char *name, elf_object_t *startlook, } if (req_obj->dyn.symbolic) - if (_dl_find_symbol_obj(req_obj, name, h, flags, ref, &weak_sym, + if (find_symbol_obj(req_obj, name, h, flags, ref, &weak_sym, &weak_object)) { object = req_obj; found = 1; @@ -279,7 +278,7 @@ retry_nonglobal_dlo: (object != req_obj)) continue; - if (_dl_find_symbol_obj(object, name, h, flags, ref, &weak_sym, + if (find_symbol_obj(object, name, h, flags, ref, &weak_sym, &weak_object)) { found = 1; break; @@ -319,7 +318,7 @@ found: } int -_dl_find_symbol_obj(elf_object_t *object, const char *name, unsigned long hash, +find_symbol_obj(elf_object_t *object, const char *name, unsigned long hash, int flags, const Elf_Sym **ref, const Elf_Sym **weak_sym, elf_object_t **weak_object) { |