diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-05-03 04:03:04 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-05-03 04:03:04 +0000 |
| commit | 861202010b6524ede32b88942404e49218d72563 (patch) | |
| tree | 33f0ffeb47fe3384f1d962c753f839e4bc867ea4 /libexec/ld.so/powerpc | |
| parent | 2f0be7bed428915aeb18090bfbce69841125fcdb (diff) | |
Make powerpc consistent with the other platforms: SYM_SEARCH_OBJ
overrides SYM_DLSYM, so remove the latter
ok drahn@, testing krw@
Diffstat (limited to 'libexec/ld.so/powerpc')
| -rw-r--r-- | libexec/ld.so/powerpc/rtld_machine.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libexec/ld.so/powerpc/rtld_machine.c b/libexec/ld.so/powerpc/rtld_machine.c index 42f609c6a2f..6fd57bc0670 100644 --- a/libexec/ld.so/powerpc/rtld_machine.c +++ b/libexec/ld.so/powerpc/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.46 2010/05/02 04:57:01 guenther Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.47 2010/05/03 04:03:03 guenther Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -449,14 +449,14 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) object->got_size = 0; this = NULL; ooff = _dl_find_symbol("__got_start", &this, - SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT|SYM_DLSYM, NULL, + SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, NULL, object, NULL); if (this != NULL) object->got_addr = ooff + this->st_value; this = NULL; ooff = _dl_find_symbol("__got_end", &this, - SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT|SYM_DLSYM, NULL, + SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, NULL, object, NULL); if (this != NULL) object->got_size = ooff + this->st_value - object->got_addr; @@ -465,14 +465,14 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) object->plt_size = 0; this = NULL; ooff = _dl_find_symbol("__plt_start", &this, - SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT|SYM_DLSYM, NULL, + SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, NULL, object, NULL); if (this != NULL) plt_addr = ooff + this->st_value; this = NULL; ooff = _dl_find_symbol("__plt_end", &this, - SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT|SYM_DLSYM, NULL, + SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, NULL, object, NULL); if (this != NULL) object->plt_size = ooff + this->st_value - plt_addr; |