AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 21:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to 2.1.x development version

Browse Source
This commit is contained in:
Ulrich Drepper 1997-02-15 04:31:01 +00:00
parent f2a7bb209a
commit 4ead5e7163
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,8 @@ elf_alpha_fix_plt(struct link_map *l,
static inline void static inline void
elf_machine_rela (struct link_map *map, elf_machine_rela (struct link_map *map,
const Elf64_Rela *reloc, const Elf64_Rela *reloc,
const Elf64_Sym *sym) const Elf64_Sym *sym,
const hash_name_pair *version)
{ {
Elf64_Addr * const reloc_addr = (void *)(map->l_addr + reloc->r_offset); Elf64_Addr * const reloc_addr = (void *)(map->l_addr + reloc->r_offset);
unsigned long const r_info = ELF64_R_TYPE (reloc->r_info); unsigned long const r_info = ELF64_R_TYPE (reloc->r_info);
@ -355,7 +356,7 @@ elf_machine_rela (struct link_map *map,
{ {
Elf64_Addr loadbase, sym_value; Elf64_Addr loadbase, sym_value;
loadbase = RESOLVE (&sym, loadbase = RESOLVE (&sym, version,
r_info == R_ALPHA_JMP_SLOT ? DL_LOOKUP_NOPLT : 0); r_info == R_ALPHA_JMP_SLOT ? DL_LOOKUP_NOPLT : 0);
sym_value = sym ? loadbase + sym->st_value : 0; sym_value = sym ? loadbase + sym->st_value : 0;

24
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 Free Software Foundation, Inc. Copyright (C) 1996, 1997 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
@ -199,8 +199,8 @@ _dl_start_user:
MAP is the object containing the reloc. */ MAP is the object containing the reloc. */
static inline void static inline void
elf_machine_rela (struct link_map *map, elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
const Elf32_Rela *reloc, const Elf32_Sym *sym) const Elf32_Sym *sym, const hash_name_pair *version)
{ {
Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
Elf32_Addr loadbase; Elf32_Addr loadbase;
@ -208,29 +208,29 @@ elf_machine_rela (struct link_map *map,
switch (ELF32_R_TYPE (reloc->r_info)) switch (ELF32_R_TYPE (reloc->r_info))
{ {
case R_68K_COPY: case R_68K_COPY:
loadbase = RESOLVE (&sym, DL_LOOKUP_NOEXEC); loadbase = RESOLVE (&sym, version, DL_LOOKUP_NOEXEC);
memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size); memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size);
break; break;
case R_68K_GLOB_DAT: case R_68K_GLOB_DAT:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0; *reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break; break;
case R_68K_JMP_SLOT: case R_68K_JMP_SLOT:
loadbase = RESOLVE (&sym, DL_LOOKUP_NOPLT); loadbase = RESOLVE (&sym, version, DL_LOOKUP_NOPLT);
*reloc_addr = sym ? (loadbase + sym->st_value) : 0; *reloc_addr = sym ? (loadbase + sym->st_value) : 0;
break; break;
case R_68K_8: case R_68K_8:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend); + reloc->r_addend);
break; break;
case R_68K_16: case R_68K_16:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend); + reloc->r_addend);
break; break;
case R_68K_32: case R_68K_32:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend); + reloc->r_addend);
break; break;
@ -238,17 +238,17 @@ elf_machine_rela (struct link_map *map,
*reloc_addr = map->l_addr + reloc->r_addend; *reloc_addr = map->l_addr + reloc->r_addend;
break; break;
case R_68K_PC8: case R_68K_PC8:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr); + reloc->r_addend - (Elf32_Addr) reloc_addr);
break; break;
case R_68K_PC16: case R_68K_PC16:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr); + reloc->r_addend - (Elf32_Addr) reloc_addr);
break; break;
case R_68K_PC32: case R_68K_PC32:
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend - (Elf32_Addr) reloc_addr); + reloc->r_addend - (Elf32_Addr) reloc_addr);
break; break;

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

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. MIPS version. /* Machine-dependent ELF dynamic relocation inline functions. MIPS version.
Copyright (C) 1996 Free Software Foundation, Inc. Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>. Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
@ -422,8 +422,8 @@ _dl_start_user:\n\
MAP is the object containing the reloc. */ MAP is the object containing the reloc. */
static inline void static inline void
elf_machine_rel (struct link_map *map, elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
const ElfW(Rel) *reloc, const ElfW(Sym) *sym) const ElfW(Sym) *sym, const hash_name_pair *version)
{ {
ElfW(Addr) *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); ElfW(Addr) *const reloc_addr = (void *) (map->l_addr + reloc->r_offset);
ElfW(Addr) loadbase, undo; ElfW(Addr) loadbase, undo;
@ -454,7 +454,7 @@ elf_machine_rel (struct link_map *map,
else else
#endif #endif
undo = 0; undo = 0;
loadbase = RESOLVE (&sym, 0); loadbase = RESOLVE (&sym, version, 0);
*reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo; *reloc_addr += (sym ? (loadbase + sym->st_value) : 0) - undo;
} }
break; break;