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 /elf/dl-reloc.c | |
| 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 'elf/dl-reloc.c')
| -rw-r--r-- | elf/dl-reloc.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 54a2acc065..0bf39a8b5e 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -129,3 +129,27 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], } } } + +#include "../stdio-common/_itoa.h" +#define DIGIT(b) _itoa_lower_digits[(b) & 0xf]; + +void +internal_function +_dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt) +{ + extern const char _itoa_lower_digits[]; + if (plt) + { + char msg[] = "unexpected reloc type 0x??"; + msg[sizeof msg - 2] = DIGIT(type >> 8); + msg[sizeof msg - 1] = DIGIT(type); + _dl_signal_error (0, map->l_name, msg); + } + else + { + char msg[] = "unexpected PLT reloc type 0x??"; + msg[sizeof msg - 2] = DIGIT(type >> 8); + msg[sizeof msg - 1] = DIGIT(type); + _dl_signal_error (0, map->l_name, msg); + } +} |