[uClibc-cvs] uClibc/ldso/ldso/arm dl-sysdep.h, 1.7, 1.8 elfinterp.c, 1.18, 1.19
Erik Andersen
andersen at uclibc.org
Sat Feb 14 11:30:34 UTC 2004
- Previous message: [uClibc-cvs] uClibc/ldso/ldso dl-elf.c, 1.65, 1.66 dl-hash.c, 1.17, 1.18 dl-startup.c, 1.5, 1.6 ldso.c, 1.92, 1.93
- Next message: [uClibc-cvs] uClibc/ldso/ldso/cris dl-sysdep.h, 1.4, 1.5 elfinterp.c, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/cvs/uClibc/ldso/ldso/arm
In directory nail:/tmp/cvs-serv9702/ldso/arm
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/arm/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:40 -0000 1.7
+++ dl-sysdep.h 14 Feb 2004 11:30:31 -0000 1.8
@@ -122,3 +122,11 @@
#define PAGE_ALIGN 0xfffff000
#define ADDR_ALIGN 0xfff
#define OFFS_ALIGN 0x7ffff000
+
+/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
+ PLT entries 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_ARM_JUMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
+ | (((type) == R_ARM_COPY) * ELF_RTYPE_CLASS_COPY))
Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/arm/elfinterp.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- elfinterp.c 29 Jan 2004 12:18:51 -0000 1.18
+++ elfinterp.c 14 Feb 2004 11:30:31 -0000 1.19
@@ -118,6 +118,7 @@
int reloc_type;
ELF_RELOC *this_reloc;
char *strtab;
+ char *symname;
Elf32_Sym *symtab;
ELF_RELOC *rel_addr;
int symtab_index;
@@ -133,6 +134,7 @@
symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr);
strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr);
+ symname = strtab + symtab[symtab_index].st_name;
if (reloc_type != R_ARM_JUMP_SLOT) {
@@ -147,11 +149,11 @@
got_addr = (char **) instr_addr;
/* Get the address of the GOT entry */
- new_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name,
- tpnt->symbol_scope, tpnt, resolver);
+ new_addr = _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, strtab + symtab[symtab_index].st_name);
+ _dl_progname, symname);
_dl_exit(1);
};
#if defined (__SUPPORT_LD_DEBUG__)
@@ -159,8 +161,7 @@
{
if (_dl_debug_bindings)
{
- _dl_dprintf(_dl_debug_file, "\nresolve function: %s",
- strtab + symtab[symtab_index].st_name);
+ _dl_dprintf(_dl_debug_file, "\nresolve function: %s", symname);
if(_dl_debug_detail) _dl_dprintf(_dl_debug_file,
"\tpatch %x ==> %x @ %x", *got_addr, new_addr, got_addr);
}
@@ -283,7 +284,7 @@
if (symtab_index) {
symbol_addr = (unsigned long) _dl_find_hash(strtab + symtab[symtab_index].st_name,
- scope, (reloc_type == R_ARM_JUMP_SLOT ? tpnt : NULL), symbolrel);
+ scope, elf_machine_type_class(reloc_type));
/*
* We want to allow undefined references to weak symbols - this might
@@ -424,7 +425,7 @@
symbol_addr = (unsigned long) _dl_find_hash(strtab +
symtab[symtab_index].st_name, scope,
- NULL, copyrel);
+ ELF_RTYPE_CLASS_COPY);
if (!symbol_addr) goof++;
}
if (!goof) {
- Previous message: [uClibc-cvs] uClibc/ldso/ldso dl-elf.c, 1.65, 1.66 dl-hash.c, 1.17, 1.18 dl-startup.c, 1.5, 1.6 ldso.c, 1.92, 1.93
- Next message: [uClibc-cvs] uClibc/ldso/ldso/cris dl-sysdep.h, 1.4, 1.5 elfinterp.c, 1.7, 1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the uClibc-cvs
mailing list