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 | |
| parent | e26996aa991c92637310c12f37e266ad3931b289 (diff) | |
| download | glibc-421c80d27e2dda29efd8e53dd18090b22546867c.zip glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.gz glibc-421c80d27e2dda29efd8e53dd18090b22546867c.tar.bz2 | |
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')
| -rw-r--r-- | elf/dl-reloc.c | 24 | ||||
| -rw-r--r-- | elf/do-rel.h | 2 | ||||
| -rw-r--r-- | elf/ldsodefs.h | 7 |
3 files changed, 32 insertions, 1 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 54a2acc..0bf39a8 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); + } +} diff --git a/elf/do-rel.h b/elf/do-rel.h index 803d250..955acfe 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -48,7 +48,7 @@ elf_dynamic_do_rel (struct link_map *map, /* Doing lazy PLT relocations; they need very little info. */ ElfW(Addr) l_addr = map->l_addr; for (; r < end; ++r) - elf_machine_lazy_rel (l_addr, r); + elf_machine_lazy_rel (map, l_addr, r); } else { diff --git a/elf/ldsodefs.h b/elf/ldsodefs.h index 844e479..483e85b 100644 --- a/elf/ldsodefs.h +++ b/elf/ldsodefs.h @@ -326,6 +326,13 @@ extern void _dl_relocate_object (struct link_map *map, struct r_scope_elem *scope[], int lazy, int consider_profiling); +/* Call _dl_signal_error with a message about an unhandled reloc type. + TYPE is the result of ELFW(R_TYPE) (r_info), i.e. an R_<CPU>_* value. + PLT is nonzero if this was a PLT reloc; it just affects the message. */ +extern void _dl_reloc_bad_type (struct link_map *map, + uint_fast8_t type, int plt) + internal_function; + /* Check the version dependencies of all objects available through MAP. If VERBOSE print some more diagnostics. */ extern int _dl_check_all_versions (struct link_map *map, int verbose) |