diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-11-27 01:58:40 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-25 01:55:43 -0400 |
| commit | c3393906d84d0d9cb7d688e0f2bbf8cde92190a2 (patch) | |
| tree | 9ea8993348b94ba8d527eb7d49e6988055739708 /ldso/ldso/mips | |
| parent | 867bac0c750401d2f429ad6bb066498c3b8b35c1 (diff) | |
ldso: use ELF_xxx()/ElfW() helpers
They expand into the same code, but using the ELF_xxx()/ElfW() macros
makes it much easier to spot similarities between code bases.
Acked-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Acked-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ldso/ldso/mips')
| -rw-r--r-- | ldso/ldso/mips/elfinterp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ldso/ldso/mips/elfinterp.c b/ldso/ldso/mips/elfinterp.c index 5d0eff53b..e57a99fbe 100644 --- a/ldso/ldso/mips/elfinterp.c +++ b/ldso/ldso/mips/elfinterp.c @@ -89,7 +89,7 @@ __dl_runtime_pltresolve(struct elf_resolve *tpnt, int reloc_entry) { ELF_RELOC *this_reloc; char *strtab; - Elf32_Sym *symtab; + ElfW(Sym) *symtab; int symtab_index; char *rel_addr; char *new_addr; @@ -99,9 +99,9 @@ __dl_runtime_pltresolve(struct elf_resolve *tpnt, int reloc_entry) rel_addr = (char *)tpnt->dynamic_info[DT_JMPREL]; this_reloc = (ELF_RELOC *)(intptr_t)(rel_addr + reloc_entry); - symtab_index = ELF32_R_SYM(this_reloc->r_info); + symtab_index = ELF_R_SYM(this_reloc->r_info); - symtab = (Elf32_Sym *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB]; + symtab = (ElfW(Sym) *)(intptr_t)tpnt->dynamic_info[DT_SYMTAB]; strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; symname = strtab + symtab[symtab_index].st_name; @@ -193,7 +193,7 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, scope, tpnt, elf_machine_type_class(reloc_type), &sym_ref); - if (unlikely(!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK)) + if (unlikely(!symbol_addr && ELF_ST_BIND(symtab[symtab_index].st_info) != STB_WEAK)) return 1; if (_dl_trace_prelink) { _dl_debug_lookup (symname, tpnt, &symtab[symtab_index], @@ -224,7 +224,7 @@ int _dl_parse_relocation_information(struct dyn_elf *xpnt, sym_ref.sym = &symtab[symtab_index]; sym_ref.tpnt = NULL; - if (ELF32_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) { + if (ELF_ST_BIND(symtab[symtab_index].st_info) != STB_LOCAL) { symbol_addr = (unsigned long) _dl_find_hash(symname, scope, tpnt, elf_machine_type_class(reloc_type), &sym_ref); tls_tpnt = sym_ref.tpnt; |