From b86120ed685c140c3d19386d463d6efba436ab92 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 31 Mar 2000 05:16:38 +0000 Subject: Update. 2000-03-29 Andreas Jaeger * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_runtime_setup): Use D_PTR to access relocated entries in l_info. (elf_machine_rela): Likewise. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_runtime_setup): Likewise. (elf_machine_rela): Likewise. * sysdeps/powerpc/dl-machine.c (__elf_machine_runtime_setup): Likewise. (__elf_machine_fixup_plt): Likewise. (__process_machine_rela): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_runtime_setup): Likewise. (elf_machine_rela): Likewise. * sysdeps/arm/dl-machine.h (elf_machine_runtime_setup): Likewise. (elf_machine_rel): Likewise. * sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Likewise. (elf_machine_fixup_plt): Likewise. (elf_machine_rela): Likewise. 2000-03-29 Andreas Jaeger * sysdeps/unix/sysv/linux/msgctl.c: Use shlib-compat macros. * sysdeps/unix/sysv/linux/semctl.c: Likewise. * sysdeps/unix/sysv/linux/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit.c: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/semctl.c: Likewise. * sysdeps/unix/sysv/linux/i386/setrlimit.c: Likewise. * sysdeps/unix/sysv/linux/i386/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/msgctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/semctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/shmctl.c: Likewise. * sysdeps/unix/sysv/linux/alpha/adjtime.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/chown.c: Likewise. * sysdeps/unix/sysv/linux/alpha/oldglob.c: Use shlib-compat macros, remove K&R prototypes. --- sysdeps/alpha/dl-machine.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sysdeps/alpha') diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index d0b5c48..ad79ef6 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -97,7 +97,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) /* The GOT entries for the functions in the PLT have not been filled in yet. Their initial contents are directed to the PLT which arranges for the dynamic linker to be called. */ - plt = l->l_info[DT_PLTGOT]->d_un.d_ptr; + plt = D_PTR (l, l_info[DT_PLTGOT]); /* This function will be called to perform the relocation. */ if (!profile) @@ -349,8 +349,8 @@ elf_machine_fixup_plt(struct link_map *l, const Elf64_Rela *reloc, /* Recover the PLT entry address by calculating reloc's index into the .rela.plt, and finding that entry in the .plt. */ - rela_plt = (void *) l->l_info[DT_JMPREL]->d_un.d_ptr; - plte = (void *) (l->l_info[DT_PLTGOT]->d_un.d_ptr + 32); + rela_plt = (void *) D_PTR (l, l_info[DT_JMPREL]); + plte = (void *) (D_PTR (l, [DT_PLTGOT]) + 32); plte += 3 * (reloc - rela_plt); /* Find the displacement from the plt entry to the function. */ @@ -480,7 +480,7 @@ elf_machine_rela (struct link_map *map, than the dynamic linker's built-in definitions used while loading those libraries. */ const Elf64_Sym *const dlsymtab - = (void *) map->l_info[DT_SYMTAB]->d_un.d_ptr; + = (void *) D_PTR (map, l_info[DT_SYMTAB]); sym_value -= map->l_addr; sym_value -= dlsymtab[ELF64_R_SYM(reloc->r_info)].st_value; sym_value -= reloc->r_addend; -- cgit v1.1