diff options
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 8 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 13 | ||||
| -rw-r--r-- | sysdeps/m68k/dl-machine.h | 13 | ||||
| -rw-r--r-- | sysdeps/mips/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/mips/mips64/dl-machine.h | 6 |
5 files changed, 24 insertions, 22 deletions
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 21059f5e4f..78a6f502ed 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -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 */ diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 754a6caa13..d112e3fa9f 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -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 */ diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index afa68efe1b..f9f9bf7626 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -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 */ diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 6896e53546..5811b78b29 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -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. */ } diff --git a/sysdeps/mips/mips64/dl-machine.h b/sysdeps/mips/mips64/dl-machine.h index e2b62b8199..f200fcda64 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 <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. */ } |