From 407fe3bbb3708abc6796acc71c5fe34371c2847c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 5 Sep 2001 03:42:43 +0000 Subject: Update. 2001-09-04 Ulrich Drepper Correct very misleading message for error in failed runtime relocation. * elf/dl-error.c (_dl_signal_error): Take extra parameter to describe place of the error. (_dl_signal_cerror): Likewise. * sysdeps/generic/ldsodefs.h: Adjust prototypes. * elf/dl-close.c: Likewise. * elf/dl-deps.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-version.c: Likewise. * sysdeps/generic/dl-sysdep.c: Likewise. --- elf/dl-reloc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'elf/dl-reloc.c') diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 6e38648d88..931c9f455d 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -63,7 +63,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], & ~(_dl_pagesize - 1))); if (__builtin_expect (__mprotect (mapstart, mapend - mapstart, PROT_READ|PROT_WRITE), 0) < 0) - _dl_signal_error (errno, l->l_name, N_("\ + _dl_signal_error (errno, l->l_name, NULL, N_("\ cannot make segment writable for relocation")); } } @@ -177,7 +177,7 @@ cannot make segment writable for relocation")); if (__builtin_expect (__mprotect (mapstart, mapend - mapstart, prot), 0) < 0) - _dl_signal_error (errno, l->l_name, + _dl_signal_error (errno, l->l_name, NULL, N_("can't restore segment prot after reloc")); #ifdef CLEAR_CACHE @@ -201,7 +201,7 @@ _dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt) static char msg[] = "unexpected PLT reloc type 0x??"; msg[sizeof msg - 3] = DIGIT(type >> 4); msg[sizeof msg - 2] = DIGIT(type); - _dl_signal_error (0, map->l_name, msg); + _dl_signal_error (0, map->l_name, NULL, msg); } else { @@ -209,6 +209,6 @@ _dl_reloc_bad_type (struct link_map *map, uint_fast8_t type, int plt) static char msg[] = "unexpected reloc type 0x??"; msg[sizeof msg - 3] = DIGIT(type >> 4); msg[sizeof msg - 2] = DIGIT(type); - _dl_signal_error (0, map->l_name, msg); + _dl_signal_error (0, map->l_name, NULL, msg); } } -- cgit v1.2.3