diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 16:15:59 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-10-15 17:09:23 -0400 |
| commit | 1f5e333a158f4398437287b8b64260371422194f (patch) | |
| tree | 93d3ccf85cd0e03d9d534a615af1646123e433ec /ldso/ldso/arm | |
| parent | 21cec43543081b47f9f7d5860af44d04c92746cd (diff) | |
ldso: clean up breakage in tls merge
The TLS merge 534661b91c9849 introduced multiple style problems as well as
random breakage:
- missing _dl_free
- incomplete parametrization of _dl_lookup_hash
- restore FDPIC handling in _dl_lookup_hash
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ldso/ldso/arm')
| -rw-r--r-- | ldso/ldso/arm/aeabi_read_tp.S | 2 | ||||
| -rw-r--r-- | ldso/ldso/arm/elfinterp.c | 19 |
2 files changed, 10 insertions, 11 deletions
diff --git a/ldso/ldso/arm/aeabi_read_tp.S b/ldso/ldso/arm/aeabi_read_tp.S index f81bae676..e906d07ce 100644 --- a/ldso/ldso/arm/aeabi_read_tp.S +++ b/ldso/ldso/arm/aeabi_read_tp.S @@ -53,7 +53,7 @@ #ifndef NOT_IN_libc .global __aeabi_read_tp #else - .hidden __aeabi_read_tp + .hidden __aeabi_read_tp #endif ENTRY (__aeabi_read_tp) mov r0, #0xffff0fff diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c index 1469df016..bf7426790 100644 --- a/ldso/ldso/arm/elfinterp.c +++ b/ldso/ldso/arm/elfinterp.c @@ -89,10 +89,10 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry) } } if (!_dl_debug_nofixups) { - *got_addr = (char*)new_addr; + *got_addr = (char *)new_addr; } #else - *got_addr = (char*)new_addr; + *got_addr = (char *)new_addr; #endif return new_addr; @@ -192,8 +192,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, struct elf_resolve *def_mod = 0; int goof = 0; - reloc_addr = (unsigned long *) (tpnt->loadaddr - + (unsigned long) rpnt->r_offset); + reloc_addr = (unsigned long *) (tpnt->loadaddr + (unsigned long) rpnt->r_offset); reloc_type = ELF32_R_TYPE(rpnt->r_info); symtab_index = ELF32_R_SYM(rpnt->r_info); @@ -201,9 +200,7 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, if (symtab_index) { symbol_addr = _dl_find_hash(strtab + symtab[symtab_index].st_name, - scope, tpnt, - elf_machine_type_class(reloc_type), - &def_mod); + scope, tpnt, elf_machine_type_class(reloc_type), &def_mod); /* * We want to allow undefined references to weak symbols - this might @@ -217,9 +214,11 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, } } else { - /* Relocs against STN_UNDEF are usually treated as using a - symbol value of zero, and using the module containing the - reloc itself. */ + /* + * Relocs against STN_UNDEF are usually treated as using a + * symbol value of zero, and using the module containing the + * reloc itself. + */ symbol_addr = symtab[symtab_index].st_value; def_mod = tpnt; } |