diff options
| author | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-03-29 13:47:21 +0000 |
|---|---|---|
| committer | Joakim Tjernlund <joakim.tjernlund@transmode.se> | 2005-03-29 13:47:21 +0000 |
| commit | e6816a15ab7d7dbf3ffe75a9a22b4a37909aaf57 (patch) | |
| tree | ffd16f946ea203cf14cc44c7aaae730cc1032d01 /ldso/ldso/m68k | |
| parent | 223b81b2e707ff3cb99fdf49b7cb6bd1da7f6d21 (diff) | |
Moved the addition of load address from the fast path
where possible. This will also make ldso smaller.
However the patch touches all archs and I have only tested PPC and x86.
Diffstat (limited to 'ldso/ldso/m68k')
| -rw-r--r-- | ldso/ldso/m68k/dl-sysdep.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/m68k/elfinterp.c | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/ldso/ldso/m68k/dl-sysdep.h b/ldso/ldso/m68k/dl-sysdep.h index 88722ee21..c11d2fbfe 100644 --- a/ldso/ldso/m68k/dl-sysdep.h +++ b/ldso/ldso/m68k/dl-sysdep.h @@ -68,7 +68,7 @@ static inline void elf_machine_relative (Elf32_Addr load_off, const Elf32_Addr rel_addr, Elf32_Word relative_count) { - Elf32_Rela * rpnt = (void *) (rel_addr + load_off); + Elf32_Rela * rpnt = (void *)rel_addr; --rpnt; do { Elf32_Addr *const reloc_addr = (void *) (load_off + (++rpnt)->r_offset); diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index fcc21c497..b7d0f362a 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -69,13 +69,13 @@ _dl_linux_resolver (struct elf_resolve *tpnt, int reloc_entry) char **got_addr; unsigned int instr_addr; - rel_addr = (ELF_RELOC *)(tpnt->dynamic_info[DT_JMPREL] + tpnt->loadaddr); + rel_addr = (ELF_RELOC *)tpnt->dynamic_info[DT_JMPREL]; this_reloc = (Elf32_Rela *) (rel_addr + reloc_entry); reloc_type = ELF32_R_TYPE (this_reloc->r_info); symtab_index = ELF32_R_SYM (this_reloc->r_info); - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] + tpnt->loadaddr); - strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); + symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB]; + strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; if (unlikely(reloc_type != R_68K_JMP_SLOT)) { _dl_dprintf (2, "%s: incorrect relocation type in jump relocations\n", @@ -136,12 +136,11 @@ _dl_parse_lazy_relocation_information(struct dyn_elf *arg_rpnt, struct elf_resolve *tpnt = arg_rpnt->dyn; /* Now parse the relocation information. */ - rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); + rpnt = (Elf32_Rela *)rel_addr; rel_size = rel_size / sizeof (Elf32_Rela); - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] - + tpnt->loadaddr); - strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); + symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB]; + strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; for (i = 0; i < rel_size; i++, rpnt++) { reloc_addr = (int *) (tpnt->loadaddr + (int) rpnt->r_offset); @@ -184,12 +183,11 @@ _dl_parse_relocation_information(struct dyn_elf *arg_rpnt, struct elf_resolve *tpnt = arg_rpnt->dyn; /* Now parse the relocation information */ - rpnt = (Elf32_Rela *) (rel_addr + tpnt->loadaddr); + rpnt = (Elf32_Rela *)rel_addr; rel_size = rel_size / sizeof (Elf32_Rela); - symtab = (Elf32_Sym *) (tpnt->dynamic_info[DT_SYMTAB] - + tpnt->loadaddr); - strtab = (char *) (tpnt->dynamic_info[DT_STRTAB] + tpnt->loadaddr); + symtab = (Elf32_Sym *)tpnt->dynamic_info[DT_SYMTAB]; + strtab = (char *)tpnt->dynamic_info[DT_STRTAB]; for (i = 0; i < rel_size; i++, rpnt++) { reloc_addr = (int *) (tpnt->loadaddr + (int) rpnt->r_offset); |