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

[Erik Andersen]

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

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/sh/dl-sysdep.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dl-sysdep.h	17 Dec 2003 08:05:43 -0000	1.8
+++ dl-sysdep.h	14 Feb 2004 11:30:36 -0000	1.9
@@ -142,3 +142,12 @@
 #define PAGE_ALIGN 0xfffff000
 #define ADDR_ALIGN 0xfff
 #define OFFS_ALIGN 0x7ffff000
+
+/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry or
+   TLS variable, so undefined references should not be allowed to
+   define the value.
+   ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
+   of the main executable's symbols, as for a COPY reloc.  */
+#define elf_machine_type_class(type) \
+  ((((type) == R_SH_JMP_SLOT) * ELF_RTYPE_CLASS_PLT)	\
+   | (((type) == R_SH_COPY) * ELF_RTYPE_CLASS_COPY))

Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/sh/elfinterp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- elfinterp.c	29 Jan 2004 12:18:55 -0000	1.8
+++ elfinterp.c	14 Feb 2004 11:30:36 -0000	1.9
@@ -149,13 +149,8 @@
 
 
 	/* Get the address of the GOT entry */
-	new_addr = _dl_find_hash(symname, tpnt->symbol_scope, tpnt, resolver);
+	new_addr = _dl_find_hash(symname, tpnt->symbol_scope, ELF_RTYPE_CLASS_PLT);
 	if (!new_addr) {
-		new_addr = _dl_find_hash(symname, NULL, NULL, resolver);
-		if (new_addr) {
-			return (unsigned long) new_addr;
-		}
-
 		_dl_dprintf(2, "%s: can't resolve symbol '%s'\n", _dl_progname, symname);
 		_dl_exit(1);
 	}
@@ -270,7 +265,7 @@
 
 
 		symbol_addr = (unsigned long) _dl_find_hash(symname, scope,
-				(reloc_type == R_SH_JMP_SLOT ? tpnt : NULL), symbolrel);
+							    elf_machine_type_class(reloc_type));
 
 		/*
 		 * We want to allow undefined references to weak symbols - this might
@@ -385,7 +380,7 @@
 
 	if (symtab_index) {
 
-		symbol_addr = (unsigned long) _dl_find_hash(symname, scope, NULL, copyrel);
+		symbol_addr = (unsigned long) _dl_find_hash(symname, scope, ELF_RTYPE_CLASS_COPY);
 		if (!symbol_addr) goof++;
 	}
 	if (!goof) {