* include/unistd.h (seteuid, setegid): Add libc_hidden_proto.

	* sysdeps/generic/seteuid.c (seteuid): Add libc_hidden_def.
	* sysdeps/generic/setegid.c (setegid): Likewise.
	* sysdeps/mach/hurd/seteuid.c (seteuid): Likewise.
	* sysdeps/mach/hurd/setegid.c (setegid): Likewise.
	* sysdeps/unix/bsd/seteuid.c (seteuid): Likewise.
	* sysdeps/unix/bsd/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/aix/seteuid.c (seteuid): Likewise.
	* sysdeps/unix/sysv/aix/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/linux/i386/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/seteuid.c (seteuid): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc32/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/linux/seteuid.c (seteuid): Likewise.
	* sysdeps/unix/sysv/linux/setegid.c (setegid): Likewise.
	* sysdeps/unix/sysv/linux/i386/seteuid.c (seteuid): Likewise.
	Remove fallback if __ASSUME_SETRESUID_SYSCALL.

	* include/sys/stat.h (__fxstat_internal, __fxstat64_internal,
	__lxstat_internal, __lxstat64_internal): Remove.
	(__fxstat, __fxstat64, __lxstat, __lxstat64, __xstat, __xstat64):
	Add hidden_proto.
	* sysdeps/generic/fxstat.c (__fxstat): Add hidden_def.
	Remove INTDEF where present, remove #undef at the beginning.
	* sysdeps/generic/fxstat64.c (__fxstat64): Likewise.
	* sysdeps/generic/lxstat.c (__lxstat): Likewise.
	* sysdeps/generic/lxstat64.c (__lxstat64): Likewise.
	* sysdeps/generic/xstat.c (__xstat): Likewise.
	* sysdeps/generic/xstat64.c (__xstat64): Likewise.
	* sysdeps/mach/hurd/dl-sysdep.c (__xstat64, __fxstat64): Likewise.
	* sysdeps/mach/hurd/fxstat.c (__fxstat): Likewise.
	* sysdeps/mach/hurd/fxstat64.c (__fxstat64): Likewise.
	* sysdeps/mach/hurd/lxstat.c (__lxstat): Likewise.
	* sysdeps/mach/hurd/lxstat64.c (__lxstat64): Likewise.
	* sysdeps/mach/hurd/xstat.c (__xstat): Likewise.
	* sysdeps/mach/hurd/xstat64.c (__xstat64): Likewise.
	* sysdeps/unix/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/common/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/aix/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/sysv/aix/fxstat64.c (__fxstat64): Likewise.
	* sysdeps/unix/sysv/aix/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/aix/lxstat64.c (__lxstat64): Likewise.
	* sysdeps/unix/sysv/aix/xstat.c (__xstat): Likewise.
	* sysdeps/unix/sysv/aix/xstat64.c (__xstat64): Likewise.
	* sysdeps/unix/sysv/linux/ia64/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/sysv/linux/ia64/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/linux/ia64/xstat.c (__xstat): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/xstat.c (__xstat): Likewise.
	* sysdeps/unix/sysv/linux/i386/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/sysv/linux/i386/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/linux/i386/xstat.c (__xstat): Likewise.
	* sysdeps/unix/sysv/linux/xstat.c (__xstat): Likewise.
	* sysdeps/unix/sysv/linux/xstat64.c (__xstat64): Likewise.
	* sysdeps/unix/sysv/linux/fxstat.c (__fxstat): Likewise.
	* sysdeps/unix/sysv/linux/fxstat64.c (__fxstat64): Likewise.
	* sysdeps/unix/sysv/linux/lxstat.c (__lxstat): Likewise.
	* sysdeps/unix/sysv/linux/lxstat64.c (__lxstat64): Likewise.
	* sysdeps/unix/xstat.c (__xstat): Likewise.

	* include/sys/statvfs.h (statvfs, fstatvfs): Add libc_hidden_proto.
	* sysdeps/generic/statvfs.c (statvfs): Add libc_hidden_def.
	* sysdeps/generic/fstatvfs.c (fstatvfs): Likewise.
	* sysdeps/mach/hurd/statvfs.c (statvfs): Likewise.
	* sysdeps/mach/hurd/fstatvfs.c (fstatvfs): Likewise.
	* sysdeps/unix/sysv/linux/statvfs.c (statvfs): Likewise.
	* sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Likewise.

	* include/unistd.h (tcgetpgrp): Add libc_hidden_proto.
	* include/termios.h (tcsetattr, cfsetispeed, cfsetospeed): Likewise.
	* sysdeps/generic/tcgetpgrp.c (tcgetpgrp): Add libc_hidden_def.
	* sysdeps/generic/tcsetattr.c (tcsetattr): Likewise.
	* sysdeps/generic/speed.c (cfsetispeed, cfsetospeed): Likewise.
	* sysdeps/unix/bsd/bsd4.4/tcsetattr.c (tcgetpgrp): Likewise.
	* sysdeps/unix/bsd/sun/sunos4/tcsetattr.c (tcsetattr): Likewise.
	* sysdeps/unix/bsd/sun/sunos4/speed.c (cfsetispeed, cfsetospeed):
	Likewise.
	* sysdeps/unix/bsd/tcgetpgrp.c (tcgetpgrp): Likewise.
	* sysdeps/unix/bsd/tcsetattr.c (tcsetattr): Likewise.
	* sysdeps/unix/sysv/aix/tcsetattr.c (tcsetattr): Likewise.
	* sysdeps/unix/sysv/aix/speed.c (cfsetispeed, cfsetospeed): Likewise.
	* sysdeps/unix/sysv/linux/tcsetattr.c (tcsetattr): Likewise.
	* sysdeps/unix/sysv/linux/speed.c (cfsetispeed, cfsetospeed): Likewise.
	* sysdeps/unix/sysv/tcgetpgrp.c (tcgetpgrp): Likewise.
	* sysdeps/unix/sysv/tcsetattr.c (tcsetattr): Likewise.

	* include/string.h (strcoll): Add libc_hidden_proto.
	* string/strcoll.c (strcoll): Add libc_hidden_def.

	* misc/err.c (vwarn): Fix pasto in libc_hidden_def.

29 files changed, 60 insertions, 94 deletions

diff --git a/sysdeps/unix/sysv/aix/fxstat.c b/sysdeps/unix/sysv/aix/fxstat.c
index 4c1e145dcb..1ba56f690f 100644
--- a/sysdeps/unix/sysv/aix/fxstat.c
+++ b/sysdeps/unix/sysv/aix/fxstat.c
@@ -23,12 +23,10 @@
 
 extern int fstatx (int fd, struct stat *st, int len, int cmd);
 
-#undef __fxstat
-
 int
 __fxstat (int ver, int fd, struct stat *st)
 {
   assert (ver == 0);
   return fstatx (fd, st, sizeof (*st), STX_NORMAL);
 }
-INTDEF(__fxstat)
+hidden_def (__fxstat)
diff --git a/sysdeps/unix/sysv/aix/fxstat64.c b/sysdeps/unix/sysv/aix/fxstat64.c
index 509fb2c0cb..5f75e070c4 100644
--- a/sysdeps/unix/sysv/aix/fxstat64.c
+++ b/sysdeps/unix/sysv/aix/fxstat64.c
@@ -22,16 +22,12 @@
 #define STX_NORMAL      0x00
 #define STX_64          0x08
 
-#undef __fxstat64
-
 extern int fstatx (int fd, struct stat64 *st, int len, int cmd);
 
-#undef __fxstat64
-
 int
 __fxstat64 (int ver, int fd, struct stat64 *st)
 {
   assert (ver == 0);
   return fstatx (fd, st, sizeof (*st), STX_NORMAL | STX_64);
 }
-INTDEF(__fxstat64)
+hidden_def (__fxstat64)
diff --git a/sysdeps/unix/sysv/aix/lxstat.c b/sysdeps/unix/sysv/aix/lxstat.c
index 52562bd934..879e80cbe8 100644
--- a/sysdeps/unix/sysv/aix/lxstat.c
+++ b/sysdeps/unix/sysv/aix/lxstat.c
@@ -21,8 +21,6 @@
 
 #define STX_LINK        0x01
 
-#undef __lxstat
-
 extern int statx (const char *pathname, struct stat *st, int len, int cmd);
 
 int
@@ -31,5 +29,4 @@ __lxstat (int ver, const char *pathname, struct stat *st)
   assert (ver == 0);
   return statx (pathname, st, sizeof (*st), STX_LINK);
 }
-
-INTDEF(__lxstat)
+hidden_def (__lxstat)
diff --git a/sysdeps/unix/sysv/aix/lxstat64.c b/sysdeps/unix/sysv/aix/lxstat64.c
index d68b4583d2..73324fe55b 100644
--- a/sysdeps/unix/sysv/aix/lxstat64.c
+++ b/sysdeps/unix/sysv/aix/lxstat64.c
@@ -22,8 +22,6 @@
 #define STX_LINK        0x01
 #define STX_64          0x08
 
-#undef __lxstat64
-
 extern int statx (const char *pathname, struct stat64 *st, int len, int cmd);
 
 int
@@ -32,5 +30,4 @@ __lxstat64 (int ver, const char *pathname, struct stat64 *st)
   assert (ver == 0);
   return statx (pathname, st, sizeof (*st), STX_LINK | STX_64);
 }
-
-INTDEF(__lxstat64)
+hidden_def (__lxstat64)
diff --git a/sysdeps/unix/sysv/aix/speed.c b/sysdeps/unix/sysv/aix/speed.c
index c7fa51bb90..3a453a7bef 100644
--- a/sysdeps/unix/sysv/aix/speed.c
+++ b/sysdeps/unix/sysv/aix/speed.c
@@ -1,5 +1,5 @@
 /* `struct termios' speed frobnication functions.  AIX version.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 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
@@ -53,6 +53,8 @@ cfsetospeed (termios_p, speed)
   termios_p->c_cflag |= speed & 0x0000000f;
   return 0;
 }
+libc_hidden_def (cfsetospeed)
+
 
 /* Set the input baud rate stored in *TERMIOS_P to SPEED.  */
 int
@@ -70,3 +72,4 @@ cfsetispeed (termios_p, speed)
   termios_p->c_cflag |= (speed << 16) & ~0x000f0000;
   return 0;
 }
+libc_hidden_def (cfsetispeed)
diff --git a/sysdeps/unix/sysv/aix/tcsetattr.c b/sysdeps/unix/sysv/aix/tcsetattr.c
index b11676e4c3..8e78da1c2c 100644
--- a/sysdeps/unix/sysv/aix/tcsetattr.c
+++ b/sysdeps/unix/sysv/aix/tcsetattr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1995,1996,1997,2000,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
@@ -195,3 +195,4 @@ tcsetattr (fd, optional_actions, termios_p)
     return -1;
   return 0;
 }
+libc_hidden_def (tcsetattr)
diff --git a/sysdeps/unix/sysv/aix/xstat.c b/sysdeps/unix/sysv/aix/xstat.c
index bf901e2f47..c76ad07999 100644
--- a/sysdeps/unix/sysv/aix/xstat.c
+++ b/sysdeps/unix/sysv/aix/xstat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 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
@@ -21,7 +21,6 @@
 
 #define STX_NORMAL      0x00
 
-
 extern int statx (const char *pathname, struct stat *st, int len, int cmd);
 
 int
@@ -30,3 +29,4 @@ __xstat (int ver, const char *pathname, struct stat *st)
   assert (ver == 0);
   return statx (pathname, st, sizeof (*st), STX_NORMAL);
 }
+hidden_def (__xstat)
diff --git a/sysdeps/unix/sysv/aix/xstat64.c b/sysdeps/unix/sysv/aix/xstat64.c
index 91f83175f3..cb1bea1182 100644
--- a/sysdeps/unix/sysv/aix/xstat64.c
+++ b/sysdeps/unix/sysv/aix/xstat64.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1999, 2000, 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
@@ -31,3 +31,4 @@ __xstat64 (int ver, const char *pathname, struct stat64 *st)
   assert (ver == 0);
   return statx (pathname, st, sizeof (*st), STX_NORMAL | STX_64);
 }
+hidden_def (__xstat64)
diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c
index 96b703fa82..4452e50f81 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -43,3 +43,4 @@ fstatvfs (int fd, struct statvfs *buf)
   /* We signal success if the statfs call succeeded.  */
   return 0;
 }
+libc_hidden_def (fstatvfs)
diff --git a/sysdeps/unix/sysv/linux/fxstat.c b/sysdeps/unix/sysv/linux/fxstat.c
index 95466269fb..78bcceb6e0 100644
--- a/sysdeps/unix/sysv/linux/fxstat.c
+++ b/sysdeps/unix/sysv/linux/fxstat.c
@@ -20,7 +20,6 @@
 /* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
    will complain since they don't strictly match.  */
 #define __fxstat64 __fxstat64_disable
-#define __fxstat64_internal __fxstat64_internal_disable
 
 #include <errno.h>
 #include <stddef.h>
@@ -36,8 +35,6 @@
 
 extern int __syscall_fstat (int, struct kernel_stat *__unbounded);
 
-#undef __fxstat
-
 /* Get information about the file FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
@@ -55,11 +52,10 @@ __fxstat (int vers, int fd, struct stat *buf)
   return result;
 }
 
-INTDEF(__fxstat)
+hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat);
 #ifdef XSTAT_IS_XSTAT64
 #undef __fxstat64
-#undef __fxstat64_internal
 strong_alias (__fxstat, __fxstat64);
-INTDEF(__fxstat64)
+hidden_ver (__fxstat, __fxstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/fxstat64.c b/sysdeps/unix/sysv/linux/fxstat64.c
index 2d9a6c17cc..e64d8dfacb 100644
--- a/sysdeps/unix/sysv/linux/fxstat64.c
+++ b/sysdeps/unix/sysv/linux/fxstat64.c
@@ -43,7 +43,6 @@ extern int __have_no_stat64;
 #endif
 
 /* Get information about the file FD in BUF.  */
-extern int ___fxstat64 (int vers, int fd, struct stat64 *buf);
 
 int
 ___fxstat64 (int vers, int fd, struct stat64 *buf)
@@ -90,8 +89,6 @@ ___fxstat64 (int vers, int fd, struct stat64 *buf)
 
 versioned_symbol (libc, ___fxstat64, __fxstat64, GLIBC_2_2);
 
-INTDEF2(___fxstat64, __fxstat64)
-
 # if SHLIB_COMPAT(libc, GLIBC_2_1, GLIBC_2_2)
 strong_alias (___fxstat64, __old__fxstat64)
 compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1);
@@ -99,6 +96,5 @@ compat_symbol (libc, __old__fxstat64, __fxstat64, GLIBC_2_1);
 
 #else
 strong_alias (___fxstat64, __fxstat64);
-
-INTDEF(__fxstat64)
 #endif
+hidden_ver (___fxstat64, __fxstat64)
diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c
index 8a6de099d5..86dbd71175 100644
--- a/sysdeps/unix/sysv/linux/i386/fxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/fxstat.c
@@ -44,8 +44,6 @@ extern int __have_no_stat64;
 # endif
 #endif
 
-#undef __fxstat
-
 /* Get information about the file FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
@@ -96,10 +94,10 @@ __fxstat (int vers, int fd, struct stat *buf)
 #endif  /* __ASSUME_STAT64_SYSCALL  */
 }
 
-INTDEF(__fxstat)
+hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat);
 #ifdef XSTAT_IS_XSTAT64
 #undef __fxstat64
 strong_alias (__fxstat, __fxstat64);
-INTDEF(__fxstat64)
+hidden_ver (__fxstat, __fxstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/lxstat.c b/sysdeps/unix/sysv/linux/i386/lxstat.c
index 58a837ee1c..0da6312fa4 100644
--- a/sysdeps/unix/sysv/linux/i386/lxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/lxstat.c
@@ -34,8 +34,6 @@
 
 #include <xstatconv.c>
 
-#undef __lxstat
-
 extern int __syscall_lstat (const char *__unbounded,
 			    struct kernel_stat *__unbounded);
 
@@ -98,10 +96,10 @@ __lxstat (int vers, const char *name, struct stat *buf)
 #endif
 }
 
-INTDEF(__lxstat)
+hidden_def (__lxstat)
 weak_alias (__lxstat, _lxstat);
 #ifdef XSTAT_IS_XSTAT64
 #undef __lxstat64
-INTDEF(__lxstat64)
 strong_alias (__lxstat, __lxstat64);
+hidden_ver (__lxstat, __lxstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.c b/sysdeps/unix/sysv/linux/i386/xstat.c
index 1e99d7ecef..cc383ec2fb 100644
--- a/sysdeps/unix/sysv/linux/i386/xstat.c
+++ b/sysdeps/unix/sysv/linux/i386/xstat.c
@@ -1,5 +1,5 @@
 /* xstat using old-style Unix stat system call.
-   Copyright (C) 1991,95,96,97,98,2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,95,96,97,98,2000,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
@@ -94,9 +94,10 @@ __xstat (int vers, const char *name, struct stat *buf)
   return result;
 #endif  /* __ASSUME_STAT64_SYSCALL  */
 }
-
+hidden_def (__xstat)
 weak_alias (__xstat, _xstat);
 #ifdef XSTAT_IS_XSTAT64
 # undef __xstat64
 strong_alias (__xstat, __xstat64);
+hidden_ver (__xstat, __xstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/ia64/fxstat.c b/sysdeps/unix/sysv/linux/ia64/fxstat.c
index 297762e276..b402401992 100644
--- a/sysdeps/unix/sysv/linux/ia64/fxstat.c
+++ b/sysdeps/unix/sysv/linux/ia64/fxstat.c
@@ -20,10 +20,6 @@
 /* Ho hum, since xstat == xstat64 we must get rid of the prototype or gcc
    will complain since they don't strictly match.  */
 #define __fxstat64 __fxstat64_disable
-#define __fxstat64_internal __fxstat64_internal_disable
-/* To avoid the optimizations of using _internal functions define
-   NOT_IN_libc.  */
-#define NOT_IN_libc	1
 
 #include <errno.h>
 #include <stddef.h>
@@ -35,9 +31,6 @@
 
 extern int __syscall_fstat (int, struct stat *__unbounded);
 
-#undef __fxstat
-#undef __fxstat64_internal
-
 /* Get information about the file FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
@@ -45,8 +38,8 @@ __fxstat (int vers, int fd, struct stat *buf)
   return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 (buf));
 }
 
-INTDEF(__fxstat)
+hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat);
 #undef __fxstat64
 strong_alias (__fxstat, __fxstat64);
-INTDEF(__fxstat64)
+hidden_ver (__fxstat, __fxstat64)
diff --git a/sysdeps/unix/sysv/linux/ia64/lxstat.c b/sysdeps/unix/sysv/linux/ia64/lxstat.c
index 19f9af0259..97b3a24e01 100644
--- a/sysdeps/unix/sysv/linux/ia64/lxstat.c
+++ b/sysdeps/unix/sysv/linux/ia64/lxstat.c
@@ -20,10 +20,6 @@
 /* Ho hum, since xstat == xstat64 we must get rid of the prototype or gcc
    will complain since they don't strictly match.  */
 #define __lxstat64 __lxstat64_disable
-#define __lxstat64_internal __lxstat64_internal_disable
-/* To avoid the optimizations of using _internal functions define
-   NOT_IN_libc.  */     
-#define NOT_IN_libc	1
 
 #include <errno.h>
 #include <stddef.h>
@@ -33,9 +29,6 @@
 #include <sys/syscall.h>
 #include <bp-checks.h>
 
-#undef __lxstat
-#undef __lxstat64_internal
-
 extern int __syscall_lstat (const char *__unbounded, struct stat *__unbounded);
 
 /* Get information about the file FD in BUF.  */
@@ -45,8 +38,8 @@ __lxstat (int vers, const char *name, struct stat *buf)
   return INLINE_SYSCALL (lstat, 2, CHECK_STRING (name), CHECK_1 (buf));
 }
 
-INTDEF(__lxstat)
+hidden_def (__lxstat)
 weak_alias (__lxstat, _lxstat);
 #undef __lxstat64
 strong_alias (__lxstat, __lxstat64);
-INTDEF(__lxstat64)
+hidden_ver (__lxstat, __lxstat64)
diff --git a/sysdeps/unix/sysv/linux/ia64/xstat.c b/sysdeps/unix/sysv/linux/ia64/xstat.c
index f8cdd86d26..63d1192efb 100644
--- a/sysdeps/unix/sysv/linux/ia64/xstat.c
+++ b/sysdeps/unix/sysv/linux/ia64/xstat.c
@@ -1,5 +1,5 @@
 /* xstat using old-style Unix stat system call.
-   Copyright (C) 1991, 95, 96, 97, 98, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,95,96,97,98,2000,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
@@ -37,7 +37,8 @@ __xstat (int vers, const char *name, struct stat *buf)
 {
   return INLINE_SYSCALL (stat, 2, name, CHECK_1 (buf));
 }
-
+hidden_def (__xstat)
 weak_alias (__xstat, _xstat);
 #undef __xstat64
 strong_alias (__xstat, __xstat64);
+hidden_ver (__xstat, __xstat64)
diff --git a/sysdeps/unix/sysv/linux/lxstat.c b/sysdeps/unix/sysv/linux/lxstat.c
index af9176f4d5..9de85f5699 100644
--- a/sysdeps/unix/sysv/linux/lxstat.c
+++ b/sysdeps/unix/sysv/linux/lxstat.c
@@ -20,7 +20,6 @@
 /* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
    will complain since they don't strictly match.  */
 #define __lxstat64 __lxstat64_disable
-#define __lxstat64_internal __lxstat64_internal_disable
 
 #include <errno.h>
 #include <stddef.h>
@@ -33,8 +32,6 @@
 
 #include <xstatconv.c>
 
-#undef __lxstat
-
 extern int __syscall_lstat (const char *__unbounded,
 			    struct kernel_stat *__unbounded);
 
@@ -56,11 +53,10 @@ __lxstat (int vers, const char *name, struct stat *buf)
   return result;
 }
 
-INTDEF(__lxstat)
+hidden_def (__lxstat)
 weak_alias (__lxstat, _lxstat);
 #ifdef XSTAT_IS_XSTAT64
 #undef __lxstat64
-#undef __lxstat64_internal
 strong_alias (__lxstat, __lxstat64);
-INTDEF(__lxstat64)
+hidden_ver (__lxstat, __lxstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/lxstat64.c b/sysdeps/unix/sysv/linux/lxstat64.c
index 6191af2724..0a29200014 100644
--- a/sysdeps/unix/sysv/linux/lxstat64.c
+++ b/sysdeps/unix/sysv/linux/lxstat64.c
@@ -32,8 +32,6 @@
 # include <xstatconv.c>
 #endif
 
-#undef __lxstat64
-
 extern int __syscall_lstat (const char *__unbounded,
 			    struct kernel_stat *__unbounded);
 
@@ -47,8 +45,6 @@ extern int __have_no_stat64;
 #endif
 
 /* Get information about the file NAME in BUF.  */
-extern int ___lxstat64 (int vers, const char *name, struct stat64 *buf);
-
 int
 ___lxstat64 (int vers, const char *name, struct stat64 *buf)
 {
@@ -102,4 +98,4 @@ compat_symbol (libc, __old__lxstat64, __lxstat64, GLIBC_2_1);
 #else
 strong_alias (___lxstat64, __lxstat64);
 #endif
-INTDEF2(___lxstat64, __lxstat64)
+hidden_ver (___lxstat64, __lxstat64)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c b/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c
index 36d38751ad..95ed437943 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/fxstat.c
@@ -30,8 +30,6 @@
 
 extern int __syscall_fstat (int, struct stat *);
 
-#undef __fxstat
-
 /* Get information about the file FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
@@ -39,8 +37,8 @@ __fxstat (int vers, int fd, struct stat *buf)
   return INLINE_SYSCALL (fstat, 2, fd, buf);
 }
 
-INTDEF(__fxstat)
+hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat);
 #undef __fxstat64
 strong_alias (__fxstat, __fxstat64);
-INTDEF(__fxstat64)
+hidden_ver (__fxstat, __fxstat64)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c b/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c
index 5a86fc177a..3bcc4bede0 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/lxstat.c
@@ -28,8 +28,6 @@
 #include <sysdep.h>
 #include <sys/syscall.h>
 
-#undef __lxstat
-
 extern int __syscall_lstat (const char *, struct stat *);
 
 /* Get information about the file FD in BUF.  */
@@ -39,8 +37,8 @@ __lxstat (int vers, const char *name, struct stat *buf)
   return INLINE_SYSCALL (lstat, 2, name, buf);
 }
 
-INTDEF(__lxstat)
+hidden_def (__lxstat)
 weak_alias (__lxstat, _lxstat);
 #undef __lxstat64
-INTDEF(__lxstat64)
 strong_alias (__lxstat, __lxstat64);
+hidden_ver (__lxstat, __lxstat64)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/xstat.c b/sysdeps/unix/sysv/linux/s390/s390-64/xstat.c
index d2e3e108ac..9283dd8b51 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/xstat.c
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/xstat.c
@@ -1,5 +1,5 @@
 /* xstat using old-style Unix stat system call.  64 bit S/390 version.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 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,7 +36,8 @@ __xstat (int vers, const char *name, struct stat *buf)
 {
   return INLINE_SYSCALL (stat, 2, name, buf);
 }
-
+hidden_def (__xstat)
 weak_alias (__xstat, _xstat);
 #undef __xstat64
 strong_alias (__xstat, __xstat64);
+hidden_ver (__xstat, __xstat64)
diff --git a/sysdeps/unix/sysv/linux/speed.c b/sysdeps/unix/sysv/linux/speed.c
index 74c660e04c..a6a03a0c63 100644
--- a/sysdeps/unix/sysv/linux/speed.c
+++ b/sysdeps/unix/sysv/linux/speed.c
@@ -1,5 +1,5 @@
 /* `struct termios' speed frobnication functions.  Linux version.
-   Copyright (C) 1991, 92, 93, 95, 96, 97, 98, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991,92,93,95,96,97,98,2000,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
@@ -71,6 +71,8 @@ cfsetospeed  (termios_p, speed)
 
   return 0;
 }
+libc_hidden_def (cfsetospeed)
+
 
 /* Set the input baud rate stored in *TERMIOS_P to SPEED.
    Although for Linux there is no difference between input and output
@@ -99,3 +101,4 @@ cfsetispeed (termios_p, speed)
 
   return 0;
 }
+libc_hidden_def (cfsetispeed)
diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c
index d681a6b0d3..9992d7757f 100644
--- a/sysdeps/unix/sysv/linux/statvfs.c
+++ b/sysdeps/unix/sysv/linux/statvfs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 2000, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -43,3 +43,4 @@ statvfs (const char *file, struct statvfs *buf)
   /* We signal success if the statfs call succeeded.  */
   return 0;
 }
+libc_hidden_def (statvfs)
diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c
index b0f29946e3..031cad7add 100644
--- a/sysdeps/unix/sysv/linux/tcsetattr.c
+++ b/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1996, 1997, 1998, 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
@@ -118,3 +118,4 @@ tcsetattr (fd, optional_actions, termios_p)
 
   return retval;
 }
+libc_hidden_def (tcsetattr)
diff --git a/sysdeps/unix/sysv/linux/xstat.c b/sysdeps/unix/sysv/linux/xstat.c
index 93d63aa36d..5f936388db 100644
--- a/sysdeps/unix/sysv/linux/xstat.c
+++ b/sysdeps/unix/sysv/linux/xstat.c
@@ -1,5 +1,6 @@
 /* xstat using old-style Unix stat system call.
-   Copyright (C) 1991, 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1995, 1996, 1997, 1998, 2000, 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
@@ -52,9 +53,10 @@ __xstat (int vers, const char *name, struct stat *buf)
 
   return result;
 }
-
+hidden_def (__xstat)
 weak_alias (__xstat, _xstat);
 #ifdef XSTAT_IS_XSTAT64
 #undef __xstat64
 strong_alias (__xstat, __xstat64);
+hidden_ver (__xstat, __xstat64)
 #endif
diff --git a/sysdeps/unix/sysv/linux/xstat64.c b/sysdeps/unix/sysv/linux/xstat64.c
index c40378458b..388ff8fa68 100644
--- a/sysdeps/unix/sysv/linux/xstat64.c
+++ b/sysdeps/unix/sysv/linux/xstat64.c
@@ -48,9 +48,6 @@ int __have_no_stat64;
 /* Get information about the file NAME in BUF.  */
 
 int
-___xstat64 (int vers, const char *name, struct stat64 *buf);
-
-int
 ___xstat64 (int vers, const char *name, struct stat64 *buf)
 {
   int result;
@@ -104,3 +101,4 @@ compat_symbol (libc, __old__xstat64, __xstat64, GLIBC_2_1);
 #else
 strong_alias (___xstat64, __xstat64);
 #endif
+hidden_ver (___xstat64, __xstat64)
diff --git a/sysdeps/unix/sysv/tcgetpgrp.c b/sysdeps/unix/sysv/tcgetpgrp.c
index 2771e9236a..4f64eac638 100644
--- a/sysdeps/unix/sysv/tcgetpgrp.c
+++ b/sysdeps/unix/sysv/tcgetpgrp.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1997, 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
@@ -33,3 +33,4 @@ tcgetpgrp (fd)
     return (pid_t) -1;
   return (pid_t) pgrp;
 }
+libc_hidden_def (tcgetpgrp)
diff --git a/sysdeps/unix/sysv/tcsetattr.c b/sysdeps/unix/sysv/tcsetattr.c
index 5a446e4db9..d39ac76a39 100644
--- a/sysdeps/unix/sysv/tcsetattr.c
+++ b/sysdeps/unix/sysv/tcsetattr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995, 1996, 1997, 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
@@ -207,3 +207,4 @@ tcsetattr (fd, optional_actions, termios_p)
     return -1;
   return 0;
 }
+libc_hidden_def (tcsetattr)