From f53fd3b96886107435bdf03f65e0e9f61c51119e Mon Sep 17 00:00:00 2001 From: Dale Rahn Date: Mon, 28 Jul 2003 03:11:01 +0000 Subject: The fifth argument to _dl_find_symbol is a 'int size', not a SYM_ define. Fix several calls which had the incorrect but working define in that position It happened that SYM_NOTPLT was 0, which was the desired size value. --- libexec/ld.so/sparc64/rtld_machine.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'libexec/ld.so/sparc64/rtld_machine.c') diff --git a/libexec/ld.so/sparc64/rtld_machine.c b/libexec/ld.so/sparc64/rtld_machine.c index 93a28a9dd0c..3dea5af724c 100644 --- a/libexec/ld.so/sparc64/rtld_machine.c +++ b/libexec/ld.so/sparc64/rtld_machine.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rtld_machine.c,v 1.27 2003/07/06 20:04:00 deraadt Exp $ */ +/* $OpenBSD: rtld_machine.c,v 1.28 2003/07/28 03:11:00 drahn Exp $ */ /* * Copyright (c) 1999 Dale Rahn @@ -705,15 +705,13 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) object->got_size = 0; this = NULL; ooff = _dl_find_symbol("__got_start", object, &this, - SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, SYM_NOTPLT, - NULL); + SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, NULL); if (this != NULL) object->got_addr = ooff + this->st_value; this = NULL; ooff = _dl_find_symbol("__got_end", object, &this, - SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, SYM_NOTPLT, - NULL); + SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, NULL); if (this != NULL) object->got_size = ooff + this->st_value - object->got_addr; @@ -721,15 +719,13 @@ _dl_md_reloc_got(elf_object_t *object, int lazy) object->plt_size = 0; this = NULL; ooff = _dl_find_symbol("__plt_start", object, &this, - SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, SYM_NOTPLT, - NULL); + SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, NULL); if (this != NULL) plt_addr = ooff + this->st_value; this = NULL; ooff = _dl_find_symbol("__plt_end", object, &this, - SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, SYM_NOTPLT, - NULL); + SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, NULL); if (this != NULL) object->plt_size = ooff + this->st_value - plt_addr; -- cgit v1.2.3