[uClibc-cvs] uClibc/ldso/ldso/mips dl-sysdep.h, 1.7, 1.8 elfinterp.c, 1.9, 1.10

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso/mips
In directory nail:/tmp/cvs-serv9702/ldso/mips

Modified Files:
	dl-sysdep.h elfinterp.c 
Log Message:
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 ...



Index: dl-sysdep.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/mips/dl-sysdep.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- dl-sysdep.h	17 Dec 2003 08:05:42 -0000	1.7
+++ dl-sysdep.h	14 Feb 2004 11:30:33 -0000	1.8
@@ -134,3 +134,5 @@
 #define PAGE_ALIGN 0xfffff000
 #define ADDR_ALIGN 0xfff
 #define OFFS_ALIGN 0x7ffff000
+
+#define elf_machine_type_class(type)		ELF_RTYPE_CLASS_PLT

Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/mips/elfinterp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- elfinterp.c	5 Feb 2004 01:54:33 -0000	1.9
+++ elfinterp.c	14 Feb 2004 11:30:33 -0000	1.10
@@ -128,8 +128,13 @@
 	strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
 	symname = strtab + sym->st_name;
 
-	new_addr = (unsigned long) _dl_find_hash(strtab + sym->st_name,
-		 tpnt->symbol_scope, tpnt, resolver);
+	new_addr = (unsigned long) _dl_find_hash(symname,
+			tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT);
+	if (!new_addr) {
+		_dl_dprintf (2, "%s: can't resolve symbol '%s'\n",
+				_dl_progname, symname);
+		_dl_exit (1);
+	}
 
 	/* Address of jump instruction to fix up */
 	instr_addr = (unsigned long) (got + local_gotno + sym_index - gotsym);
@@ -279,12 +284,12 @@
 					*got_entry = sym->st_value + (unsigned long) tpnt->loadaddr;
 				else {
 					*got_entry = (unsigned long) _dl_find_hash(strtab +
-						sym->st_name, tpnt->symbol_scope, NULL, copyrel);
+						sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY);
 				}
 			}
 			else if (sym->st_shndx == SHN_COMMON) {
 				*got_entry = (unsigned long) _dl_find_hash(strtab +
-					sym->st_name, tpnt->symbol_scope, NULL, copyrel);
+					sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY);
 			}
 			else if (ELF32_ST_TYPE(sym->st_info) == STT_FUNC &&
 				*got_entry != sym->st_value)
@@ -295,7 +300,7 @@
 			}
 			else {
 				*got_entry = (unsigned long) _dl_find_hash(strtab +
-					sym->st_name, tpnt->symbol_scope, NULL, copyrel);
+					sym->st_name, tpnt->symbol_scope, ELF_RTYPE_CLASS_COPY);
 			}
 
 			got_entry++;