Update.

2001-03-07  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Use
	_dl_error_printf instead of _dl_sysdep_error.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h (_dl_procinfo):
	Use _dl_printf instead of _dl_sysdep_message.
	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h (_dl_procinfo):
	Likewise.

diff --git a/ChangeLog b/ChangeLog
index a027ed5dac0dd996e3a7effbbd68c4a764e72a36..42d84e4b2ecfb0116f46215ba7326bdfa3471562 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-07  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Use
+       _dl_error_printf instead of _dl_sysdep_error.
+       * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h (_dl_procinfo):
+       Use _dl_printf instead of _dl_sysdep_message.
+       * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h (_dl_procinfo):
+       Likewise.
+
 2001-03-06  Ben Collins  <bcollins@debian.org>
 
        * manual/arith.texi (Integers): Fix documentation of fast and

diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index c17e1abd4c098bd158cd413f107307a537ba4f57..d5e8edf5cebacc8029b88de648f4446fbf307b63 100644 (file)
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  SPARC 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
@@ -392,10 +392,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));

diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index d7a5544d93c8b75364dcc09c8519f226ae4c725b..b4785c74ccdf09377bfeaba5a4a9cbc2b9cdf6d6 100644 (file)
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  Sparc64 version.
-   Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 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
@@ -227,10 +227,10 @@ elf_machine_rela (struct link_map *map, const Elf64_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));

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
index adfe4be05c5ef6e7364894a7985d24edad23e59c..aff1c9d6b001ca0635fddf6b2feea2ec81e27b31 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h
@@ -1,5 +1,5 @@
 /* Linux/sparc32 version of processor capability information handling macros.
-   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.
    Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
 
@@ -35,13 +35,13 @@ _dl_procinfo (int word)
 {
   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 (" ", sparc32_cap_flags[i], NULL);
+      _dl_printf (" %s", sparc32_cap_flags[i]);
 
-  _dl_sysdep_message ("\n", NULL);
+  _dl_printf ("\n");
 
   return 0;
 }

diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h
index 78bd5c883c2f78a57a60b2ab273231761df1c890..59a9e901434bb799e2b9299c9e6d3ed6a768ada9 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h
@@ -1,5 +1,5 @@
 /* Linux/sparc64 version of processor capability information handling macros.
-   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.
    Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
 
@@ -35,13 +35,13 @@ _dl_procinfo (int word)
 {
   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 (" ", sparc64_cap_flags[i], NULL);
+      _dl_printf (" %s", sparc64_cap_flags[i]);
 
-  _dl_sysdep_message ("\n", NULL);
+  _dl_printf ("\n");
 
   return 0;
 }