Rework symbol lookup to more closely match sun's documentation, now

treats dlopens as load groups. ok kurt@

1 files changed, 16 insertions, 13 deletions

diff --git a/libexec/ld.so/i386/rtld_machine.c b/libexec/ld.so/i386/rtld_machine.c
index 06aca82d00b..6c891593490 100644
--- a/libexec/ld.so/i386/rtld_machine.c
+++ b/libexec/ld.so/i386/rtld_machine.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtld_machine.c,v 1.16 2004/05/25 21:42:48 mickey Exp $ */
+/*	$OpenBSD: rtld_machine.c,v 1.17 2005/09/16 23:19:42 drahn Exp $ */
 
 /*
  * Copyright (c) 2002 Dale Rahn
@@ -227,11 +227,11 @@ _dl_md_reloc(elf_object_t *object, int rel, int relsz)
 			} else {
 				this = NULL;
 				ooff = _dl_find_symbol_bysym(object,
-				    ELF_R_SYM(rels->r_info), _dl_objects,
-				    &this,NULL,SYM_SEARCH_ALL|SYM_WARNNOTFOUND|
+				    ELF_R_SYM(rels->r_info), &this,
+				    SYM_SEARCH_ALL|SYM_WARNNOTFOUND|
 				    ((type == R_TYPE(JUMP_SLOT))?
 					SYM_PLT:SYM_NOTPLT),
-				    sym->st_size);
+				    sym->st_size, NULL);
 				if (this == NULL) {
 resolve_failed:
 					_dl_printf("%s: %s: can't resolve "
@@ -257,10 +257,10 @@ resolve_failed:
 			size_t size = dstsym->st_size;
 			Elf_Addr soff;
 
-			soff = _dl_find_symbol(symn, object->next, &srcsym,
-			    NULL, SYM_SEARCH_ALL|SYM_WARNNOTFOUND|
+			soff = _dl_find_symbol(symn, &srcsym,
+			    SYM_SEARCH_OTHER|SYM_WARNNOTFOUND|
 			    ((type == R_TYPE(JUMP_SLOT)) ? SYM_PLT:SYM_NOTPLT),
-			    size, object);
+			    size, object, NULL);
 			if (srcsym == NULL)
 				goto resolve_failed;
 
@@ -356,8 +356,9 @@ _dl_bind(elf_object_t *object, int index)
 
 	addr = (Elf_Word *)(object->load_offs + rel->r_offset);
 	this = NULL;
-	ooff = _dl_find_symbol(symn, _dl_objects, &this, NULL,
-	    SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size, object);
+	ooff = _dl_find_symbol(symn, &this,
+	    SYM_SEARCH_ALL|SYM_WARNNOTFOUND|SYM_PLT, sym->st_size,
+	    object, NULL);
 	if (this == NULL) {
 		_dl_printf("lazy binding failed!\n");
 		*((int *)0) = 0;	/* XXX */
@@ -406,14 +407,16 @@ _dl_md_reloc_got(elf_object_t *object, int lazy)
 	object->got_addr = NULL;
 	object->got_size = 0;
 	this = NULL;
-	ooff = _dl_find_symbol("__got_start", object, &this, NULL,
-	    SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object);
+	ooff = _dl_find_symbol("__got_start", &this,
+	    SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, 0,
+	    object, NULL);
 	if (this != NULL)
 		object->got_addr = ooff + this->st_value;
 
 	this = NULL;
-	ooff = _dl_find_symbol("__got_end", object, &this, NULL,
-	    SYM_SEARCH_SELF|SYM_NOWARNNOTFOUND|SYM_PLT, 0, object);
+	ooff = _dl_find_symbol("__got_end", &this,
+	    SYM_SEARCH_OBJ|SYM_NOWARNNOTFOUND|SYM_PLT, 0,
+	    object, NULL);
 	if (this != NULL)
 		object->got_size = ooff + this->st_value  - object->got_addr;