lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-09-04 03:22:14 +03:00
Code Activity

Mon Jul 8 21:18:40 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

Browse Source 
* sysdeps/m68k/dl-machine.h (RESOLVE): New macro, defined
	differently based on [RTLD_BOOTSTRAP].
	(elf_machine_rela): Use it instead of the fn ptr arg directly.
This commit is contained in:
Roland McGrath
1996-07-10 14:42:15 +00:00
parent 07a4742f9e
commit 63d9ce12c1
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,38 +81,38 @@ elf_machine_rela (struct link_map *map,
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;
#ifdef RTLD_BOOTSTRAP
#define RESOLVE(noplt) map->l_addr
#else
#define RESOLVE(noplt) (*resolve) (&sym, (Elf32_Addr) reloc_addr, noplt)
#endif
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, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (0);
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 ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : loadbase = RESOLVE (0);
/* RESOLVE is null during bootstrap relocation. */
map->l_addr);
*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 ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 1) : loadbase = RESOLVE (1);
/* RESOLVE is null during bootstrap relocation. */
map->l_addr);
*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, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (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, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (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 ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : loadbase = RESOLVE (0);
/* RESOLVE is null during bootstrap relocation. */
map->l_addr);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend); + reloc->r_addend);
break; break;
@@ -120,19 +120,19 @@ 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, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (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
- (Elf32_Addr) reloc_addr); - (Elf32_Addr) reloc_addr);
break; break;
case R_68K_PC16: case R_68K_PC16:
loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (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
- (Elf32_Addr) reloc_addr); - (Elf32_Addr) reloc_addr);
break; break;
case R_68K_PC32: case R_68K_PC32:
loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); loadbase = RESOLVE (0);
*reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0)
+ reloc->r_addend + reloc->r_addend
- (Elf32_Addr) reloc_addr); - (Elf32_Addr) reloc_addr);
@@ -143,6 +143,8 @@ elf_machine_rela (struct link_map *map,
assert (! "unexpected dynamic reloc type"); assert (! "unexpected dynamic reloc type");
break; break;
} }
#undef RESOLVE
} }
static inline void static inline void