From 421c80d27e2dda29efd8e53dd18090b22546867c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 21 Jul 1999 16:58:06 +0000 Subject: 1999-07-21 Roland McGrath * 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. --- sysdeps/mips/dl-machine.h | 6 +++--- sysdeps/mips/mips64/dl-machine.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'sysdeps/mips') diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 6896e53..5811b78 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -25,7 +25,6 @@ #define ELF_MACHINE_NO_PLT -#include #include #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. */ } diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h index e2b62b8..f200fcd 100644 --- a/sysdeps/mips/mips64/dl-machine.h +++ b/sysdeps/mips/mips64/dl-machine.h @@ -25,7 +25,6 @@ #define ELF_MACHINE_NO_PLT -#include #include #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. */ } -- cgit v1.1