* include/stdlib.h: Use libc_hidden_proto for qsort.

	* stdlib/msort.c: Add libc_hidden_def.

	* include/utime.h: Use libc_hidden_proto for utime.
	* sysdeps/generic/utime.c: Add libc_hidden_def.
	* sysdeps/unix/utime.c: Likewise.

	* sysdeps/generic/utmp_file.c (LOCK_FILE): sigemptyset -> __sigemptyset
	* sysdeps/posix/profil.c (__profil): sigfillset -> __sigfillset
	* sysdeps/posix/sprofil.c (__sprofil): Likewise.
	* shadow/lckpwdf.c (__lckpwdf): Likewise (both).
	* sysdeps/posix/spawni.c (__spawni): sigismember -> __sigismember

	* include/signal.h: Use libc_hidden_proto for raise, sigemptyset,
	sigfillset, sigismember, __sigpause, __libc_current_sigrtmin,
	and __libc_current_sigrtmax.
	* signal/sigismem.c: Add libc_hidden_def.
	* signal/sigfillset.c: Likewise.
	* signal/sigempty.c: Likewise.
	* sysdeps/generic/sigpause.c (__sigpause): Likewise.
	* sysdeps/posix/sigpause.c (__sigpause): Likewise.
	* sysdeps/unix/bsd/osf/alpha/sigpause.S: Likewise.

11 files changed, 50 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index ab80a2859c..e682cfeed4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2002-08-03  Roland McGrath  <roland@redhat.com>
+
+	* include/stdlib.h: Use libc_hidden_proto for qsort.
+	* stdlib/msort.c: Add libc_hidden_def.
+
+	* include/utime.h: Use libc_hidden_proto for utime.
+	* sysdeps/generic/utime.c: Add libc_hidden_def.
+	* sysdeps/unix/utime.c: Likewise.
+
+	* sysdeps/generic/utmp_file.c (LOCK_FILE): sigemptyset -> __sigemptyset
+	* sysdeps/posix/profil.c (__profil): sigfillset -> __sigfillset
+	* sysdeps/posix/sprofil.c (__sprofil): Likewise.
+	* shadow/lckpwdf.c (__lckpwdf): Likewise (both).
+	* sysdeps/posix/spawni.c (__spawni): sigismember -> __sigismember
+
+	* include/signal.h: Use libc_hidden_proto for raise, sigemptyset,
+	sigfillset, sigismember, __sigpause, __libc_current_sigrtmin,
+	and __libc_current_sigrtmax.
+	* signal/sigismem.c: Add libc_hidden_def.
+	* signal/sigfillset.c: Likewise.
+	* signal/sigempty.c: Likewise.
+	* sysdeps/generic/sigpause.c (__sigpause): Likewise.
+	* sysdeps/posix/sigpause.c (__sigpause): Likewise.
+	* sysdeps/unix/bsd/osf/alpha/sigpause.S: Likewise.
+
 2002-08-03  Ulrich Drepper  <drepper@redhat.com>
 
 	* include/string.h: Use libc_hidden_proto for __strcasecmp_l,
diff --git a/include/stdlib.h b/include/stdlib.h
index 39629e1f6b..b699010908 100644
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -12,6 +12,7 @@
 libc_hidden_proto (exit)
 libc_hidden_proto (getenv)
 libc_hidden_proto (bsearch)
+libc_hidden_proto (qsort)
 libc_hidden_proto (__secure_getenv)
 
 extern long int __random (void);
diff --git a/include/utime.h b/include/utime.h
index 6dadc53ad6..aecd6a14d8 100644
--- a/include/utime.h
+++ b/include/utime.h
@@ -1 +1,7 @@
+#ifndef _UTIME_H
+
 #include <io/utime.h>
+
+libc_hidden_proto (utime)
+
+#endif /* utime.h */
diff --git a/shadow/lckpwdf.c b/shadow/lckpwdf.c
index b24cf65cd8..67d9937ac2 100644
--- a/shadow/lckpwdf.c
+++ b/shadow/lckpwdf.c
@@ -1,5 +1,5 @@
 /* Handle locking of password file.
-   Copyright (C) 1996, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996,98,2000,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -121,7 +121,7 @@ __lckpwdf (void)
      restore the old signal behaviour.  */
   memset (&new_act, '\0', sizeof (struct sigaction));
   new_act.sa_handler = noop_handler;
-  sigfillset (&new_act.sa_mask);
+  __sigfillset (&new_act.sa_mask);
   new_act.sa_flags = 0ul;
 
   /* Install new action handler for alarm and save old.  */
@@ -130,7 +130,7 @@ __lckpwdf (void)
     RETURN_CLOSE_FD (-1);
 
   /* Now make sure the alarm signal is not blocked.  */
-  sigemptyset (&new_set);
+  __sigemptyset (&new_set);
   __sigaddset (&new_set, SIGALRM);
   if (__sigprocmask (SIG_UNBLOCK, &new_set, &saved_set) < 0)
     RETURN_RESTORE_HANDLER (-1);
diff --git a/stdlib/msort.c b/stdlib/msort.c
index 3668370cd5..880c5d1e3d 100644
--- a/stdlib/msort.c
+++ b/stdlib/msort.c
@@ -1,6 +1,6 @@
 /* An alternative to qsort, with an identical interface.
    This file is part of the GNU C Library.
-   Copyright (C) 1992, 1995-1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1992,95-97,99,2000,01,02 Free Software Foundation, Inc.
    Written by Mike Haertel, September 1988.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -93,7 +93,7 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
   if (size < 1024)
     {
       void *buf = __alloca (size);
-      
+
       /* The temporary array is small, so put it on the stack.  */
       msort_with_tmp (b, n, s, cmp, buf);
     }
@@ -153,3 +153,4 @@ qsort (void *b, size_t n, size_t s, __compar_fn_t cmp)
 	}
     }
 }
+libc_hidden_def (qsort)
diff --git a/sysdeps/generic/utime.c b/sysdeps/generic/utime.c
index 22de6f363a..09d0cc6679 100644
--- a/sysdeps/generic/utime.c
+++ b/sysdeps/generic/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,95,96,97,2002 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
@@ -36,8 +36,7 @@ utime (file, times)
   __set_errno (ENOSYS);
   return -1;
 }
-
-
+libc_hidden_def (utime)
 
 stub_warning (utime)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c
index 1f88b360c3..0baf4118e9 100644
--- a/sysdeps/generic/utmp_file.c
+++ b/sysdeps/generic/utmp_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996,1997,1998,1999,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1996,97,98,99,2000,01,02 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>
    and Paul Janzen <pcj@primenet.com>, 1996.
@@ -57,7 +57,7 @@ static void timeout_handler (int signum) {};
                                                                         \
   /* Establish signal handler.  */                                      \
   action.sa_handler = timeout_handler;                                  \
-  sigemptyset (&action.sa_mask);                                        \
+  __sigemptyset (&action.sa_mask);                                      \
   action.sa_flags = 0;                                                  \
   __sigaction (SIGALRM, &action, &old_action);                          \
                                                                         \
diff --git a/sysdeps/posix/profil.c b/sysdeps/posix/profil.c
index 43798aeb0b..d789c121cd 100644
--- a/sysdeps/posix/profil.c
+++ b/sysdeps/posix/profil.c
@@ -1,5 +1,5 @@
 /* Low-level statistical profiling support function.  Mostly POSIX.1 version.
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996,97,98,2002 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
@@ -96,7 +96,7 @@ __profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 
   act.sa_handler = (sighandler_t) &profil_counter;
   act.sa_flags = SA_RESTART;
-  sigfillset (&act.sa_mask);
+  __sigfillset (&act.sa_mask);
   if (__sigaction (SIGPROF, &act, &oact) < 0)
     return -1;
 
diff --git a/sysdeps/posix/spawni.c b/sysdeps/posix/spawni.c
index 330f2192a7..a072ab77b0 100644
--- a/sysdeps/posix/spawni.c
+++ b/sysdeps/posix/spawni.c
@@ -1,5 +1,5 @@
 /* Guts of POSIX spawn interface.  Generic POSIX.1 version.
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000,01,02 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
@@ -113,7 +113,7 @@ __spawni (pid_t *pid, const char *file,
       sa.sa_handler = SIG_DFL;
 
       for (sig = 1; sig <= _NSIG; ++sig)
-	if (sigismember (&attrp->__sd, sig) != 0
+	if (__sigismember (&attrp->__sd, sig) != 0
 	    && __sigaction (sig, &sa, NULL) != 0)
 	  _exit (SPAWN_ERROR);
 
diff --git a/sysdeps/posix/sprofil.c b/sysdeps/posix/sprofil.c
index 070daf4023..d6fdd9a316 100644
--- a/sysdeps/posix/sprofil.c
+++ b/sysdeps/posix/sprofil.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001,02 Free Software Foundation, Inc.
    Contributed by David Mosberger-Tang <davidm@hpl.hp.com>.
    This file is part of the GNU C Library.
 
@@ -340,7 +340,7 @@ __sprofil (struct prof *profp, int profcnt, struct timeval *tvp,
   else
     act.sa_handler = (sighandler_t) &profil_counter_ushort;
   act.sa_flags = SA_RESTART;
-  sigfillset (&act.sa_mask);
+  __sigfillset (&act.sa_mask);
   if (__sigaction (SIGPROF, &act, &prof_info.saved_action) < 0)
     return -1;
 
diff --git a/sysdeps/unix/utime.c b/sysdeps/unix/utime.c
index 4b1f23a497..cbfc351337 100644
--- a/sysdeps/unix/utime.c
+++ b/sysdeps/unix/utime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991,94,97,2002 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
@@ -49,3 +49,4 @@ utime (file, times)
 
   return __utimes (file, timevals);
 }
+libc_hidden_def (utime)