diff options
| author | Dale Rahn <drahn@cvs.openbsd.org> | 2005-05-10 03:36:08 +0000 |
|---|---|---|
| committer | Dale Rahn <drahn@cvs.openbsd.org> | 2005-05-10 03:36:08 +0000 |
| commit | ba63d6cf60afa1d91d7be6764afb5b1f24ff1978 (patch) | |
| tree | 93b1be5065fbd0e57d61d97a66a0c99e47da6b96 /libexec/ld.so/resolve.c | |
| parent | 045f394f80448de62bdad4a1efa368d3c4e8ca9c (diff) | |
Recommit the destructor order fix, now that the amd64 bug was fixed.
'no problem' pval@
Diffstat (limited to 'libexec/ld.so/resolve.c')
| -rw-r--r-- | libexec/ld.so/resolve.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libexec/ld.so/resolve.c b/libexec/ld.so/resolve.c index 26a9f46b68c..a1d643926f6 100644 --- a/libexec/ld.so/resolve.c +++ b/libexec/ld.so/resolve.c @@ -1,4 +1,4 @@ -/* $OpenBSD: resolve.c,v 1.26 2005/04/06 00:16:53 deraadt Exp $ */ +/* $OpenBSD: resolve.c,v 1.27 2005/05/10 03:36:07 drahn Exp $ */ /* * Copyright (c) 1998 Per Fogelstrom, Opsycon AB @@ -187,8 +187,9 @@ _dl_lookup_object(const char *name) return(0); } -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, +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, elf_object_t **weak_object); sym_cache *_dl_symcache; @@ -261,7 +262,7 @@ _dl_find_symbol(const char *name, elf_object_t *startlook, } if (req_obj->dyn.symbolic) - if (find_symbol_obj(req_obj, name, h, flags, ref, &weak_sym, + if (_dl_find_symbol_obj(req_obj, name, h, flags, ref, &weak_sym, &weak_object)) { object = req_obj; found = 1; @@ -278,7 +279,7 @@ retry_nonglobal_dlo: (object != req_obj)) continue; - if (find_symbol_obj(object, name, h, flags, ref, &weak_sym, + if (_dl_find_symbol_obj(object, name, h, flags, ref, &weak_sym, &weak_object)) { found = 1; break; @@ -318,7 +319,7 @@ found: } int -find_symbol_obj(elf_object_t *object, const char *name, unsigned long hash, +_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, elf_object_t **weak_object) { |