diff options
author | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
commit | deec524084aa2faad66f7aae7e8b5ba1ab6789fd (patch) | |
tree | 8498414c429c57ce6b93a49c265aebcb8180c312 /ldso/ldso/ldso.c | |
parent | 7bd4a2f4aaabca0e46015fe0216c086c7f61f1d4 (diff) |
Joakim Tjernlund writes:
Hi it is me again.
This is the latest ldso patch. the NEW weak symbol handling works now
with a little special handling in _dl_find_hash(). You get to chose
if you want the new or old handling :)
There was 2 missing _dl_check_if_named_library_is_loaded() calls in _dlopen().
I then disabled the _dl_check_if_named_library_is_loaded() in dl-elf.c since
it is rendundant.
Question, why does some _dl_linux_resolver(), like i386, have 2 calls
to _dl_find_hash()? I think that is wrong, isn't it?
I really hope you can check this out soon ...
Diffstat (limited to 'ldso/ldso/ldso.c')
-rw-r--r-- | ldso/ldso/ldso.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 71fadd4dd..2e0fa757f 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -609,12 +609,12 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt up each symbol individually. */ - _dl_brkp = (unsigned long *) (intptr_t) _dl_find_hash("___brk_addr", NULL, NULL, symbolrel); + _dl_brkp = (unsigned long *) (intptr_t) _dl_find_hash("___brk_addr", NULL, 0); if (_dl_brkp) { *_dl_brkp = brk_addr; } - _dl_envp = (unsigned long *) (intptr_t) _dl_find_hash("__environ", NULL, NULL, symbolrel); + _dl_envp = (unsigned long *) (intptr_t) _dl_find_hash("__environ", NULL, 0); if (_dl_envp) { *_dl_envp = (unsigned long) envp; @@ -638,10 +638,10 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, struct elf_resolve *app_tpnt } #endif - _dl_atexit = (int (*)(void *)) (intptr_t) _dl_find_hash("atexit", NULL, NULL, symbolrel); + _dl_atexit = (int (*)(void *)) (intptr_t) _dl_find_hash("atexit", NULL, 0); #if defined (__SUPPORT_LD_DEBUG__) _dl_on_exit = (int (*)(void (*)(int, void *),void*)) - (intptr_t) _dl_find_hash("on_exit", NULL, NULL, symbolrel); + (intptr_t) _dl_find_hash("on_exit", NULL, 0); #endif /* Notify the debugger we have added some objects. */ |