From 6ae4fca735cee01c892f41a63bf04a791ec1bb66 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 28 Sep 2002 19:45:42 +0000 Subject: [PATCH] * sysdeps/mach/hurd/dl-sysdep.c (_dl_important_hwcaps): Use INTUSE for _dl_signal_error. * sysdeps/mips/dl-machine.h (elf_machine_runtime_link_map): Likewise. * sysdeps/powerpc/powerpc64/dl-machine.c (_dl_reloc_overflow): Likewise. * sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise. (elf_machine_rela): Likewise. --- ChangeLog | 10 ++++++++++ sysdeps/arm/dl-machine.h | 10 ++++++---- sysdeps/mach/hurd/dl-sysdep.c | 3 ++- sysdeps/mips/dl-machine.h | 2 +- sysdeps/powerpc/powerpc64/dl-machine.c | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c21043..d766196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2002-09-28 Roland McGrath + + * sysdeps/mach/hurd/dl-sysdep.c (_dl_important_hwcaps): Use INTUSE for + _dl_signal_error. + * sysdeps/mips/dl-machine.h (elf_machine_runtime_link_map): Likewise. + * sysdeps/powerpc/powerpc64/dl-machine.c + (_dl_reloc_overflow): Likewise. + * sysdeps/arm/dl-machine.h (elf_machine_rel): Likewise. + (elf_machine_rela): Likewise. + 2002-09-27 Steven Munroe * include/libc-symbols.h (__hidden_dot_weak1): Fix typo. Replace diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 9905d15..e3e666a 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -523,8 +523,9 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, topbits = newvalue & 0xfe000000; if (topbits != 0xfe000000 && topbits != 0x00000000) { - _dl_signal_error (0, map->l_name, NULL, - "R_ARM_PC24 relocation out of range"); + INTUSE (_dl_signal_error) + (0, map->l_name, NULL, + "R_ARM_PC24 relocation out of range"); } } newvalue >>= 2; @@ -577,8 +578,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, topbits = newvalue & 0xfe000000; if (topbits != 0xfe000000 && topbits != 0x00000000) { - _dl_signal_error (0, map->l_name, NULL, - "R_ARM_PC24 relocation out of range"); + INTUSE (_dl_signal_error) + (0, map->l_name, NULL, + "R_ARM_PC24 relocation out of range"); } } newvalue >>= 2; diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 6d00940..a0795f1 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -648,7 +648,8 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, /* Return an empty array. Hurd has no hardware capabilities. */ result = (struct r_strlenpair *) malloc (sizeof (*result)); if (result == NULL) - _dl_signal_error (ENOMEM, NULL, NULL, "cannot create capability list"); + INTUSE (_dl_signal_error) (ENOMEM, NULL, NULL, + "cannot create capability list"); result[0].str = (char *) result; /* Does not really matter. */ result[0].len = 0; diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 7dbdd79..08e5a6e 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -238,7 +238,7 @@ elf_machine_runtime_link_map (ElfW(Addr) gpreg, ElfW(Addr) stub_pc) } } - _dl_signal_error (0, NULL, NULL, "cannot find runtime link map"); + INTUSE (_dl_signal_error) (0, NULL, NULL, "cannot find runtime link map"); return NULL; } diff --git a/sysdeps/powerpc/powerpc64/dl-machine.c b/sysdeps/powerpc/powerpc64/dl-machine.c index ef7b340..bbaedc8 100644 --- a/sysdeps/powerpc/powerpc64/dl-machine.c +++ b/sysdeps/powerpc/powerpc64/dl-machine.c @@ -46,5 +46,5 @@ _dl_reloc_overflow (struct link_map *map, t = stpcpy (t, "'"); } t = stpcpy (t, " out of range"); - _dl_signal_error (0, map->l_name, NULL, buffer); + INTUSE (_dl_signal_error) (0, map->l_name, NULL, buffer); } -- 2.7.4