From 35fc382add7924e79b9dc706125593c14905a425 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Feb 2001 06:36:10 +0000 Subject: Update. * sysdeps/arm/dl-machine.h: Likewise. * sysdeps/hppa/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/s390/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. --- sysdeps/arm/dl-machine.h | 10 +++++----- sysdeps/generic/dl-cache.c | 4 ++-- sysdeps/generic/dl-sysdep.c | 2 +- sysdeps/generic/libc-start.c | 4 ++-- sysdeps/hppa/dl-machine.h | 10 +++++----- sysdeps/i386/dl-machine.h | 10 +++++----- sysdeps/m68k/dl-machine.h | 10 +++++----- sysdeps/powerpc/dl-machine.c | 8 ++++---- sysdeps/s390/dl-machine.h | 10 +++++----- sysdeps/sh/dl-machine.h | 10 +++++----- sysdeps/unix/sysv/linux/dl-osinfo.h | 2 +- sysdeps/unix/sysv/linux/i386/dl-librecon.h | 4 ++-- sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 8 +++++--- 13 files changed, 47 insertions(+), 45 deletions(-) (limited to 'sysdeps') diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 36ae4cf..75c37c5 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. ARM version. - Copyright (C) 1995,96,97,98,99,2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -436,10 +436,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, const char *strtab; strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n", + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index f08bbf1..5e16f28 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -155,7 +155,7 @@ _dl_load_cache_lookup (const char *name) /* Print a message if the loading of libs is traced. */ if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0)) - _dl_debug_message (1, " search cache=", LD_SO_CACHE, "\n", NULL); + _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE); if (cache == NULL) { @@ -253,7 +253,7 @@ _dl_load_cache_lookup (const char *name) /* Print our result if wanted. */ if (__builtin_expect (_dl_debug_mask & DL_DEBUG_LIBS, 0) && best != NULL) - _dl_debug_message (1, " trying file=", best, "\n", NULL); + _dl_debug_printf (" trying file=%s\n", best); return best; } diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c index fc2fa08..3dc7625 100644 --- a/sysdeps/generic/dl-sysdep.c +++ b/sysdeps/generic/dl-sysdep.c @@ -264,7 +264,7 @@ _dl_show_auxv (void) else if (__builtin_expect (auxvars[idx].form, hex) == hex) val = _itoa_word (av->a_un.a_val, buf + sizeof buf - 1, 16, 0); - _dl_sysdep_message (auxvars[idx].label, val, "\n", NULL); + _dl_printf ("%s%s\n", auxvars[idx].label, val); } } } diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index c02fa8a..fc2886d 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -116,14 +116,14 @@ BP_SYM (__libc_start_main) (int (*main) (int, char **, char **), /* Call the initializer of the program, if any. */ #ifdef SHARED if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0)) - _dl_debug_message (1, "\ninitialize program: ", argv[0], "\n\n", NULL); + _dl_debug_printf ("\ninitialize program: %s\n\n", argv[0]); #endif if (init) (*init) (); #ifdef SHARED if (__builtin_expect (_dl_debug_mask & DL_DEBUG_IMPCALLS, 0)) - _dl_debug_message (1, "\ntransferring control: ", argv[0], "\n\n", NULL); + _dl_debug_printf ("\ntransferring control: %s\n\n", argv[0]); #endif exit ((*main) (argc, argv, __environ)); diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h index 89ad542..f8a8e7b 100644 --- a/sysdeps/hppa/dl-machine.h +++ b/sysdeps/hppa/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. PA-RISC version. - Copyright (C) 1995, 1996, 1997, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc. Contributed by David Huggins-Daines This file is part of the GNU C Library. @@ -575,10 +575,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const char *strtab; strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n", + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index 3f7a6a3..d310ef6 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. i386 version. - Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. + Copyright (C) 1995,96,97,98,99,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -351,10 +351,10 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, const char *strtab; strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n", + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index 3381d6f..e2a12cb 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. m68k version. - Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -255,10 +255,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const char *strtab; strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n", + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/powerpc/dl-machine.c b/sysdeps/powerpc/dl-machine.c index 82b24bc..84bd8c2 100644 --- a/sysdeps/powerpc/dl-machine.c +++ b/sysdeps/powerpc/dl-machine.c @@ -468,10 +468,10 @@ __process_machine_rela (struct link_map *map, const char *strtab; strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, onsider re-linking\n" + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (char *) finaladdr, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/s390/dl-machine.h b/sysdeps/s390/dl-machine.h index 3432426..fbbecf0 100644 --- a/sysdeps/s390/dl-machine.h +++ b/sysdeps/s390/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. S390 Version. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2001 Free Software Foundation, Inc. Contributed by Carl Pederson & Martin Schwidefsky. This file is part of the GNU C Library. @@ -395,10 +395,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const char *strtab; strtab = (const char *) D_PTR(map,l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n", + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index 99109f7..3137d40 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. SH version. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -461,10 +461,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, const char *strtab; strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]); - _dl_sysdep_error (_dl_argv[0] ?: "", - ": Symbol `", strtab + refsym->st_name, - "' has different size in shared object, " - "consider re-linking\n", NULL); + _dl_error_printf ("\ +%s: Symbol `%s' has different size in shared object, consider re-linking\n" + _dl_argv[0] ?: "", + strtab + refsym->st_name); } memcpy (reloc_addr, (void *) value, MIN (sym->st_size, refsym->st_size)); diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index 2d705b0..a56f8e6 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -33,7 +33,7 @@ static inline void __attribute__ ((__noreturn__)) dl_fatal (const char *str) { - _dl_sysdep_output (2, str, NULL); + _dl_dprintf (2, str); _exit (1); } #endif diff --git a/sysdeps/unix/sysv/linux/i386/dl-librecon.h b/sysdeps/unix/sysv/linux/i386/dl-librecon.h index 3af2ce3..7d486c5 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-librecon.h +++ b/sysdeps/unix/sysv/linux/i386/dl-librecon.h @@ -1,5 +1,5 @@ /* Optional code to distinguish library flavours. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -41,7 +41,7 @@ break; \ \ /* We print a `5' or `6' depending on the outcome. */ \ - _dl_sysdep_message (d->d_tag != DT_NULL ? "5\n" : "6\n", NULL); \ + _dl_printf (d->d_tag != DT_NULL ? "5\n" : "6\n"); \ } \ } \ while (0) diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index e55959a..346ee8d 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -21,6 +21,8 @@ #ifndef _DL_PROCINFO_H #define _DL_PROCINFO_H 1 +#include + /* If anything should be added here check whether the size of each string is still ok with the given array size. */ extern const char _dl_x86_cap_flags[][7]; @@ -43,13 +45,13 @@ _dl_procinfo (int word) in the kernel sources. */ int i; - _dl_sysdep_message ("AT_HWCAP: ", NULL); + _dl_printf ("AT_HWCAP: "); for (i = 0; i < _DL_HWCAP_COUNT; ++i) if (word & (1 << i)) - _dl_sysdep_message (" ", _dl_x86_cap_flags[i], NULL); + _dl_printf (" %s", _dl_x86_cap_flags[i]); - _dl_sysdep_message ("\n", NULL); + _dl_printf ("\n"); return 0; } -- cgit v1.1