mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use D_PTR to access relocated entries in l_info.

Browse Source
This commit is contained in:
Ulrich Drepper 2000-03-31 05:16:19 +00:00
parent 17e74c26b7
commit 7189e3b807
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysdeps/alpha/dl-machine.h
View File

@ -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 /* The GOT entries for the functions in the PLT have not been
filled in yet. Their initial contents are directed to the filled in yet. Their initial contents are directed to the
PLT which arranges for the dynamic linker to be called. */ 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. */ /* This function will be called to perform the relocation. */
if (!profile) 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 /* Recover the PLT entry address by calculating reloc's index into the
.rela.plt, and finding that entry in the .plt. */ .rela.plt, and finding that entry in the .plt. */
rela_plt = (void *) l->l_info[DT_JMPREL]->d_un.d_ptr; rela_plt = (void *) D_PTR (l, l_info[DT_JMPREL]);
plte = (void *) (l->l_info[DT_PLTGOT]->d_un.d_ptr + 32); plte = (void *) (D_PTR (l, [DT_PLTGOT]) + 32);
plte += 3 * (reloc - rela_plt); plte += 3 * (reloc - rela_plt);
/* Find the displacement from the plt entry to the function. */ /* 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 than the dynamic linker's built-in definitions used
while loading those libraries. */ while loading those libraries. */
const Elf64_Sym *const dlsymtab 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 -= map->l_addr;
sym_value -= dlsymtab[ELF64_R_SYM(reloc->r_info)].st_value; sym_value -= dlsymtab[ELF64_R_SYM(reloc->r_info)].st_value;
sym_value -= reloc->r_addend; sym_value -= reloc->r_addend;

6
sysdeps/arm/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. ARM version. /* Machine-dependent ELF dynamic relocation inline functions. ARM version.
Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc. Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -97,7 +97,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
in. Their initial contents will arrange when called to push an in. Their initial contents will arrange when called to push an
index into the .got section, load ip with &_GLOBAL_OFFSET_TABLE_[3], index into the .got section, load ip with &_GLOBAL_OFFSET_TABLE_[3],
and then jump to _GLOBAL_OFFSET_TABLE[2]. */ and then jump to _GLOBAL_OFFSET_TABLE[2]. */
got = (Elf32_Addr *) l->l_info[DT_PLTGOT]->d_un.d_ptr; got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
got[1] = (Elf32_Addr) l; /* Identify this shared object. */ got[1] = (Elf32_Addr) l; /* Identify this shared object. */
/* The got[2] entry contains the address of a function which gets /* The got[2] entry contains the address of a function which gets
@ -413,7 +413,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
{ {
const char *strtab; const char *strtab;
strtab = (const void *) map->l_info[DT_STRTAB]->d_un.d_ptr; strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
_dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>", _dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>",
": Symbol `", strtab + refsym->st_name, ": Symbol `", strtab + refsym->st_name,
"' has different size in shared object, " "' has different size in shared object, "

6
sysdeps/m68k/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. m68k version. /* Machine-dependent ELF dynamic relocation inline functions. m68k version.
Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc. Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -78,7 +78,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
to push an offset into the .rela.plt section, push to push an offset into the .rela.plt section, push
_GLOBAL_OFFSET_TABLE_[1], and then jump to _GLOBAL_OFFSET_TABLE_[1], and then jump to
_GLOBAL_OFFSET_TABLE_[2]. */ _GLOBAL_OFFSET_TABLE_[2]. */
got = (Elf32_Addr *) l->l_info[DT_PLTGOT]->d_un.d_ptr; got = (Elf32_Addr *) D_PTR (l, l_info[DT_PLTGOT]);
got[1] = (Elf32_Addr) l; /* Identify this shared object. */ got[1] = (Elf32_Addr) l; /* Identify this shared object. */
/* The got[2] entry contains the address of a function which gets /* The got[2] entry contains the address of a function which gets
@ -289,7 +289,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
extern char **_dl_argv; extern char **_dl_argv;
const char *strtab; const char *strtab;
strtab = (const void *) map->l_info[DT_STRTAB]->d_un.d_ptr; strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
_dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>", _dl_sysdep_error (_dl_argv[0] ?: "<program name unknown>",
": Symbol `", strtab + refsym->st_name, ": Symbol `", strtab + refsym->st_name,
"' has different size in shared object, " "' has different size in shared object, "