diff options
| author | Roland McGrath <roland@gnu.org> | 1999-07-21 16:58:06 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1999-07-21 16:58:06 +0000 |
| commit | 421c80d27e2dda29efd8e53dd18090b22546867c (patch) | |
| tree | 978d5ff557f7e1178ee7e21591460cfe12a9e337 /sysdeps/sparc | |
| parent | e26996aa991c92637310c12f37e266ad3931b289 (diff) | |
| download | glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.gz glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.bz2 glibc-421c80d27e2dda29efd8e53dd18090b22546867c.zip | |
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.
Diffstat (limited to 'sysdeps/sparc')
| -rw-r--r-- | sysdeps/sparc/sparc32/dl-machine.h | 8 | ||||
| -rw-r--r-- | sysdeps/sparc/sparc64/dl-machine.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 4985afda32..e6debe05ac 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -19,7 +19,6 @@ #define ELF_MACHINE_NAME "sparc" -#include <assert.h> #include <string.h> #include <sys/param.h> #include <elf/ldsodefs.h> @@ -430,14 +429,15 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, case R_SPARC_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 (Elf32_Addr l_addr, const Elf32_Rela *reloc) +elf_machine_lazy_rel (struct link_map *map, + Elf32_Addr l_addr, const Elf32_Rela *reloc) { switch (ELF32_R_TYPE (reloc->r_info)) { @@ -446,7 +446,7 @@ elf_machine_lazy_rel (Elf32_Addr l_addr, const Elf32_Rela *reloc) case R_SPARC_JMP_SLOT: break; default: - assert (! "unexpected PLT reloc type"); + _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 1); break; } } diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 5a86ec57d8..554321ffe2 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -19,7 +19,6 @@ #define ELF_MACHINE_NAME "sparc64" -#include <assert.h> #include <string.h> #include <sys/param.h> #include <elf/ldsodefs.h> @@ -310,14 +309,15 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, 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 (Elf64_Addr l_addr, const Elf64_Rela *reloc) +elf_machine_lazy_rel (struct link_map *map, + Elf64_Addr l_addr, const Elf64_Rela *reloc) { switch (ELF64_R_TYPE (reloc->r_info)) { @@ -326,7 +326,7 @@ elf_machine_lazy_rel (Elf64_Addr l_addr, const Elf64_Rela *reloc) case R_SPARC_JMP_SLOT: break; default: - assert (! "unexpected PLT reloc type"); + _dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 1); break; } } |