Update.

	* argp/argp-help.c: Unify use of function aliases to make more compact
	PLT.
	* include/libintl.h: Likewise.
	* inet/rcmd.c: Likewise.
	* intl/dcigettext.c: Likewise.
	* libio/iofputws.c: Likewise.
	* libio/iofputws_u.c: Likewise.
	* libio/iogetwline.c: Likewise.
	* libio/swprintf.c: Likewise.
	* malloc/malloc.c: Likewise.
	* nss/digits_dots.c: Likewise.
	* posix/fnmatch.c: Likewise.
	* posix/spawn_faction_addclose.c: Likewise.
	* posix/spawn_faction_adddup2.c: Likewise.
	* posix/spawn_faction_addopen.c: Likewise.
	* posix/spawni.c: Likewise.
	* posix/wordexp.c: Likewise.
	* posix/spawni.c: Likewise.
	* resolv/res_hconf.c: Likewise.
	* resolv/res_init.c: Likewise.
	* shadow/lckpwdf.c: Likewise.
	* signal/sighold.c: Likewise.
	* signal/sigrelse.c: Likewise.
	* stdio-common/printf-parse.h: Likewise.
	* stdio-common/printf-prs.c: Likewise.
	* stdio-common/printf_fp.c: Likewise.
	* stdio-common/vfprintf.c: Likewise.
	* stdio-common/vfscanf.c: Likewise.
	* stdlib/rpmatch.c: Likewise.
	* sunrpc/create_xid.c: Likewise.
	* sunrpc/key_call.c: Likewise.
	* sysdeps/generic/setrlimit64.c: Likewise.
	* sysdeps/generic/utmp_file.c: Likewise.
	* sysdeps/generic/vlimit.c: Likewise.
	* sysdeps/posix/posix_fallocate.c: Likewise.
	* sysdeps/posix/posix_fallocate64.c: Likewise.
	* sysdeps/posix/sigpause.c: Likewise.
	* sysdeps/posix/sigset.c: Likewise.
	* sysdeps/unix/grantpt.c: Likewise.
	* sysdeps/unix/bsd/ualarm.c: Likewise.
	* sysdeps/unix/sysv/linux/dl-origin.c: Likewise.
	* sysdeps/unix/sysv/linux/getloadavg.c: Likewise.
	* sysdeps/unix/sysv/linux/ttyname.c: Likewise.
	* sysdeps/unix/sysv/linux/ulimit.c: Likewise.
	* time/strftime.c: Likewise.
	* wcsmbs/wcscoll.c: Likewise.
	* wcsmbs/wcsxfrm.c: Likewise.

	* sysdeps/powerpc/fpu_control.h (_FPU_GETCW): Allow gcc to generate
	postinc/predec instruction.

13 files changed, 25 insertions, 25 deletions

diff --git a/sysdeps/generic/setrlimit64.c b/sysdeps/generic/setrlimit64.c
index 1e55de3e26..d1dca5999e 100644
--- a/sysdeps/generic/setrlimit64.c
+++ b/sysdeps/generic/setrlimit64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1995,1996,1997,1998,2000 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
@@ -39,5 +39,5 @@ setrlimit64 (resource, rlimits)
   else
     rlimits32.rlim_max = rlimits->rlim_max;
 
-  return setrlimit (resource, &rlimits32);
+  return __setrlimit (resource, &rlimits32);
 }
diff --git a/sysdeps/generic/utmp_file.c b/sysdeps/generic/utmp_file.c
index 74e91fb948..2f172ffdbe 100644
--- a/sysdeps/generic/utmp_file.c
+++ b/sysdeps/generic/utmp_file.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1998, 1999, 2000 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.
@@ -133,7 +133,7 @@ setutent_file (void)
 	result = __fcntl (file_fd, F_SETFD, result | FD_CLOEXEC);
       if (result == -1)
 	{
-	  close (file_fd);
+	  __close (file_fd);
 	  return 0;
 	}
     }
diff --git a/sysdeps/generic/vlimit.c b/sysdeps/generic/vlimit.c
index 68addbce7a..47871bc6c4 100644
--- a/sysdeps/generic/vlimit.c
+++ b/sysdeps/generic/vlimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1996, 1997, 1998, 2000 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
@@ -43,7 +43,7 @@ vlimit (resource, value)
 	return -1;
 
       lims.rlim_cur = value;
-      return setrlimit (rlimit_res, &lims);
+      return __setrlimit (rlimit_res, &lims);
     }
 
   __set_errno (EINVAL);
diff --git a/sysdeps/posix/posix_fallocate.c b/sysdeps/posix/posix_fallocate.c
index cd0f96113e..46ce06f10d 100644
--- a/sysdeps/posix/posix_fallocate.c
+++ b/sysdeps/posix/posix_fallocate.c
@@ -61,7 +61,7 @@ posix_fallocate (int fd, __off_t offset, size_t len)
     {
       len -= step;
 
-      if (pwrite (fd, "", 1, offset) != 1)
+      if (__pwrite (fd, "", 1, offset) != 1)
 	return errno;
 
       offset += step;
diff --git a/sysdeps/posix/posix_fallocate64.c b/sysdeps/posix/posix_fallocate64.c
index 539244de58..4be48e77f9 100644
--- a/sysdeps/posix/posix_fallocate64.c
+++ b/sysdeps/posix/posix_fallocate64.c
@@ -61,7 +61,7 @@ posix_fallocate64 (int fd, __off64_t offset, size_t len)
     {
       len -= step;
 
-      if (pwrite64 (fd, "", 1, offset) != 1)
+      if (__pwrite64 (fd, "", 1, offset) != 1)
 	return errno;
 
       offset += step;
diff --git a/sysdeps/posix/sigpause.c b/sysdeps/posix/sigpause.c
index 793ec89a51..4832c6a4a5 100644
--- a/sysdeps/posix/sigpause.c
+++ b/sysdeps/posix/sigpause.c
@@ -35,7 +35,7 @@ __sigpause (sig_or_mask, is_sig)
       /* The modern X/Open implementation is requested.  */
       if (__sigprocmask (0, NULL, &set) < 0
 	  /* Yes, we call `sigdelset' and not `__sigdelset'.  */
-	  || sigdelset (&set, sig_or_mask) < 0)
+	  || __sigdelset (&set, sig_or_mask) < 0)
 	return -1;
     }
   else
diff --git a/sysdeps/posix/sigset.c b/sysdeps/posix/sigset.c
index e234d8a52d..4fea94f2cd 100644
--- a/sysdeps/posix/sigset.c
+++ b/sysdeps/posix/sigset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 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
@@ -40,7 +40,7 @@ sigset (sig, disp)
 	return SIG_ERR;
 
       /* Add the specified signal.  */
-      if (sigaddset (&set, sig) < 0)
+      if (__sigaddset (&set, sig) < 0)
 	return SIG_ERR;
 
       /* Add the signal set to the current signal mask.  */
@@ -70,7 +70,7 @@ sigset (sig, disp)
     return SIG_ERR;
 
   /* Add the specified signal.  */
-  if (sigaddset (&set, sig) < 0)
+  if (__sigaddset (&set, sig) < 0)
     return SIG_ERR;
 
   /* Remove the signal set from the current signal mask.  */
diff --git a/sysdeps/unix/bsd/ualarm.c b/sysdeps/unix/bsd/ualarm.c
index 5fd4d79a9d..b280f5b062 100644
--- a/sysdeps/unix/bsd/ualarm.c
+++ b/sysdeps/unix/bsd/ualarm.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1997, 1999, 2000 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,7 +36,7 @@ ualarm (value, interval)
   timer.it_interval.tv_sec = 0;
   timer.it_interval.tv_usec = interval;
 
-  if (setitimer (ITIMER_REAL, &timer, &otimer) < 0)
+  if (__setitimer (ITIMER_REAL, &timer, &otimer) < 0)
     return -1;
 
   return (otimer.it_value.tv_sec * 1000000) + otimer.it_value.tv_usec;
diff --git a/sysdeps/unix/grantpt.c b/sysdeps/unix/grantpt.c
index df155eb23e..1ac542f609 100644
--- a/sysdeps/unix/grantpt.c
+++ b/sysdeps/unix/grantpt.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1998.
 
@@ -48,7 +48,7 @@ pts_name (int fd, char **pts, size_t buf_len)
 
       if (buf_len)
 	{
-	  rv = ptsname_r (fd, buf, buf_len);
+	  rv = __ptsname_r (fd, buf, buf_len);
 
 	  if (rv != 0 || memchr (buf, '\0', buf_len))
 	    /* We either got an error, or we succeeded and the
@@ -126,7 +126,7 @@ grantpt (int fd)
        Try a moderate value.  */
     grbuflen = 1024;
   grtmpbuf = (char *) __alloca (grbuflen);
-  getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
+  __getgrnam_r (TTY_GROUP, &grbuf, grtmpbuf, grbuflen, &p);
   gid = p ? p->gr_gid : __getgid ();
 
   /* Make sure the group of the device is that special group.  */
@@ -157,7 +157,7 @@ grantpt (int fd)
     {
       /* Disable core dumps.  */
       struct rlimit rl = { 0, 0 };
-      setrlimit (RLIMIT_CORE, &rl);
+      __setrlimit (RLIMIT_CORE, &rl);
 
       /* We pase the master pseudo terminal as file descriptor PTY_FILENO.  */
       if (fd != PTY_FILENO)
diff --git a/sysdeps/unix/sysv/linux/dl-origin.c b/sysdeps/unix/sysv/linux/dl-origin.c
index e425467eba..6ee0ed2bf4 100644
--- a/sysdeps/unix/sysv/linux/dl-origin.c
+++ b/sysdeps/unix/sysv/linux/dl-origin.c
@@ -37,7 +37,7 @@ _dl_get_origin (void)
   char linkval[PATH_MAX];
   char *result;
 
-  if (readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
+  if (__readlink ("/proc/self/exe", linkval, PATH_MAX) != -1
       && linkval[0] != '[')
     {
       /* We can use this value.  */
diff --git a/sysdeps/unix/sysv/linux/getloadavg.c b/sysdeps/unix/sysv/linux/getloadavg.c
index 1612ad2e56..909920e6f7 100644
--- a/sysdeps/unix/sysv/linux/getloadavg.c
+++ b/sysdeps/unix/sysv/linux/getloadavg.c
@@ -1,5 +1,5 @@
 /* Get system load averages.  Linux (/proc/loadavg) version.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 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
@@ -42,7 +42,7 @@ getloadavg (double loadavg[], int nelem)
       int i;
 
       nread = __read (fd, buf, sizeof buf - 1);
-      close (fd);
+      __close (fd);
       if (nread < 0)
 	return -1;
       buf[nread - 1] = '\0';
diff --git a/sysdeps/unix/sysv/linux/ttyname.c b/sysdeps/unix/sysv/linux/ttyname.c
index 0973925cca..81149ff390 100644
--- a/sysdeps/unix/sysv/linux/ttyname.c
+++ b/sysdeps/unix/sysv/linux/ttyname.c
@@ -47,14 +47,14 @@ getttyname (const char *dev, dev_t mydev, ino_t myino, int save, int *dostat)
   struct dirent *d;
   size_t devlen = strlen (dev) + 1;
 
-  dirstream = opendir (dev);
+  dirstream = __opendir (dev);
   if (dirstream == NULL)
     {
       *dostat = -1;
       return NULL;
     }
 
-  while ((d = readdir (dirstream)) != NULL)
+  while ((d = __readdir (dirstream)) != NULL)
     if (((ino_t) d->d_fileno == myino || *dostat)
 	&& strcmp (d->d_name, "stdin")
 	&& strcmp (d->d_name, "stdout")
diff --git a/sysdeps/unix/sysv/linux/ulimit.c b/sysdeps/unix/sysv/linux/ulimit.c
index ec0337428d..dc0ba7209b 100644
--- a/sysdeps/unix/sysv/linux/ulimit.c
+++ b/sysdeps/unix/sysv/linux/ulimit.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
+/* Copyright (C) 1991,92,94,95,96,97,98,2000 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
@@ -58,7 +58,7 @@ __ulimit (int cmd, ...)
 	limit.rlim_cur = newlimit * 512;
 	limit.rlim_max = newlimit * 512;
 
-	result = setrlimit (RLIMIT_FSIZE, &limit);
+	result = __setrlimit (RLIMIT_FSIZE, &limit);
       }
       break;