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/mips | |
| 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/mips')
| -rw-r--r-- | ldso/ldso/mips/elfinterp.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 78cc4c15a..b49f09d36 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -213,14 +213,14 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, _dl_symbol_tables, tpnt_tls, 1, &sym_tls); } - switch (reloc_type) - { + switch (reloc_type) { case R_MIPS_TLS_DTPMOD64: case R_MIPS_TLS_DTPMOD32: if (tpnt_tls) *(ElfW(Word) *)reloc_addr = tpnt_tls->l_tls_modid; -#if defined (__SUPPORT_LD_DEBUG__) -_dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n", (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); +#ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n", + (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); #endif break; @@ -228,8 +228,9 @@ _dl_dprintf(2, "TLS_DTPMOD : %s, %d, %d\n", (strtab + symtab[symtab_index].st_na case R_MIPS_TLS_DTPREL32: *(ElfW(Word) *)reloc_addr += TLS_DTPREL_VALUE (sym_tls); -#if defined (__SUPPORT_LD_DEBUG__) -_dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n", (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); +#ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n", + (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); #endif break; @@ -238,8 +239,9 @@ _dl_dprintf(2, "TLS_DTPREL : %s, %x, %x\n", (strtab + symtab[symtab_index].st_na CHECK_STATIC_TLS((struct link_map *)tpnt_tls); *(ElfW(Word) *)reloc_addr += TLS_TPREL_VALUE (tpnt_tls, sym_tls); -#if defined (__SUPPORT_LD_DEBUG__) -_dl_dprintf(2, "TLS_TPREL : %s, %x, %x\n", (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); +#ifdef __SUPPORT_LD_DEBUG__ + _dl_dprintf(2, "TLS_TPREL : %s, %x, %x\n", + (strtab + symtab[symtab_index].st_name), old_val, *((unsigned int *)reloc_addr)); #endif break; } |