1999-07-21 Roland McGrath <roland@baalperazim.frob.com>
* elf/dl-reloc.c (_dl_reloc_bad_type): New function. * elf/ldsodefs.h: Declare it. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Use it instead of assert. (elf_machine_lazy_rel): Likewise. Take new arg MAP. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/mips/dl-machine.h (elf_machine_rel): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/mips/mips64/dl-machine.h (elf_machine_rel): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/m68k/dl-machine.h (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/generic/dl-machine.h (elf_machine_rel): Likewise. * sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/alpha/dl-machine.h (elf_machine_rela): Likewise. (elf_machine_lazy_rel): Likewise. * sysdeps/powerpc/dl-machine.h (elf_machine_lazy_rel): Likewise. * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Use _dl_reloc_bad_type instead of _dl_signal_error. * elf/do-rel.h (elf_dynamic_do_rel): Pass MAP to elf_machine_lazy_rel.
This commit is contained in:
parent
22b137b9fd
commit
893f3d106f
|
@ -26,7 +26,6 @@
|
|||
|
||||
#define ELF_MACHINE_NAME "alpha"
|
||||
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
|
||||
|
||||
|
@ -490,12 +489,13 @@ elf_machine_rela (struct link_map *map,
|
|||
*reloc_addr = sym_value;
|
||||
}
|
||||
else
|
||||
assert (! "unexpected dynamic reloc type");
|
||||
_dl_reloc_bad_type (map, r_type, 0);
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
elf_machine_lazy_rel (Elf64_Addr l_addr, const Elf64_Rela *reloc)
|
||||
elf_machine_lazy_rel (struct link_map *map,
|
||||
Elf64_Addr l_addr, const Elf64_Rela *reloc)
|
||||
{
|
||||
Elf64_Addr * const reloc_addr = (void *)(l_addr + reloc->r_offset);
|
||||
unsigned long const r_type = ELF64_R_TYPE (reloc->r_info);
|
||||
|
@ -509,7 +509,7 @@ elf_machine_lazy_rel (Elf64_Addr l_addr, const Elf64_Rela *reloc)
|
|||
else if (r_type == R_ALPHA_NONE)
|
||||
return;
|
||||
else
|
||||
assert (! "unexpected PLT reloc type");
|
||||
_dl_reloc_bad_type (map, r_type, 1);
|
||||
}
|
||||
|
||||
#endif /* RESOLVE */
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
/* Return nonzero iff E_MACHINE is compatible with the running host. */
|
||||
static inline int __attribute__ ((unused))
|
||||
elf_machine_matches_host (Elf32_Half e_machine)
|
||||
|
@ -438,19 +436,22 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
|
|||
break;
|
||||
}
|
||||
default:
|
||||
assert (! "unexpected dynamic reloc type");
|
||||
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
elf_machine_lazy_rel (Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
||||
elf_machine_lazy_rel (struct link_map *map,
|
||||
Elf32_Addr l_addr, const Elf32_Rel *reloc)
|
||||
{
|
||||
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
||||
/* Check for unexpected PLT reloc type. */
|
||||
assert (ELF32_R_TYPE (reloc->r_info) == R_ARM_JUMP_SLOT);
|
||||
*reloc_addr += l_addr;
|
||||
if (ELF32_R_TYPE (reloc->r_info) == R_ARM_JUMP_SLOT)
|
||||
*reloc_addr += l_addr;
|
||||
else
|
||||
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1);
|
||||
}
|
||||
|
||||
#endif /* RESOLVE */
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
|
||||
#include <sys/param.h>
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
/* Return nonzero iff E_MACHINE is compatible with the running host. */
|
||||
static inline int
|
||||
elf_machine_matches_host (Elf32_Half e_machine)
|
||||
|
@ -313,18 +311,21 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
|||
case R_68K_NONE: /* Alright, Wilbur. */
|
||||
break;
|
||||
default:
|
||||
assert (! "unexpected dynamic reloc type");
|
||||
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
elf_machine_lazy_rel (Elf32_Addr l_addr, const Elf32_Rela *reloc)
|
||||
elf_machine_lazy_rel (struct link_map *map,
|
||||
Elf32_Addr l_addr, const Elf32_Rela *reloc)
|
||||
{
|
||||
Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
|
||||
assert (ELF32_R_TYPE (reloc->r_info) == R_68K_JMP_SLOT);
|
||||
*reloc_addr += l_addr;
|
||||
if (ELF32_R_TYPE (reloc->r_info) == R_68K_JMP_SLOT)
|
||||
*reloc_addr += l_addr;
|
||||
else
|
||||
_dl_reloc_bad_type (map, ELF32_R_TYPE (reloc->r_info), 1);
|
||||
}
|
||||
|
||||
#endif /* RESOLVE */
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#define ELF_MACHINE_NO_PLT
|
||||
|
||||
#include <assert.h>
|
||||
#include <entry.h>
|
||||
|
||||
#ifndef ENTRY_POINT
|
||||
|
@ -567,13 +566,14 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
|
|||
case R_MIPS_NONE: /* Alright, Wilbur. */
|
||||
break;
|
||||
default:
|
||||
assert (! "unexpected dynamic reloc type");
|
||||
_dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
elf_machine_lazy_rel (ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
|
||||
elf_machine_lazy_rel (struct link_map *map,
|
||||
ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
|
||||
{
|
||||
/* Do nothing. */
|
||||
}
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
|
||||
#define ELF_MACHINE_NO_PLT
|
||||
|
||||
#include <assert.h>
|
||||
#include <entry.h>
|
||||
|
||||
#ifndef ENTRY_POINT
|
||||
|
@ -562,13 +561,14 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
|
|||
case R_MIPS_NONE: /* Alright, Wilbur. */
|
||||
break;
|
||||
default:
|
||||
assert (! "unexpected dynamic reloc type");
|
||||
_dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void
|
||||
elf_machine_lazy_rel (struct link_map *map, const ElfW(Rel) *reloc)
|
||||
elf_machine_lazy_rel (struct link_map *map, ElfW(Addr) l_addr,
|
||||
const ElfW(Rel) *reloc)
|
||||
{
|
||||
/* Do nothing. */
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue