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.

3 files changed, 8 insertions, 6 deletions

diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h
index 2d705b011c..a56f8e6dc0 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 3af2ce35a2..7d486c5d91 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 <drepper@cygnus.com>, 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 e55959a3b9..346ee8d0d2 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 <ldsodefs.h>
+
 /* 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;
 }