Replace use of old output functions with the new ones.

diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index 36ae4cf..75c37c5 100644 (file)
--- 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] ?: "<program name unknown>",
-                               ": 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] ?: "<program name unknown>",
+                               strtab + refsym->st_name);
            }
          memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
                                                   refsym->st_size));

diff --git a/sysdeps/hppa/dl-machine.h b/sysdeps/hppa/dl-machine.h
index 89ad542..f8a8e7b 100644 (file)
--- 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 <dhd@debian.org>
    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] ?: "<program name unknown>",
-                           ": 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] ?: "<program name unknown>",
+                           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 (file)
--- 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] ?: "<program name unknown>",
-                               ": 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] ?: "<program name unknown>",
+                               strtab + refsym->st_name);
            }
          memcpy (reloc_addr, (void *) value, MIN (sym->st_size,
                                                   refsym->st_size));