Update.

	* io/sys/stat.h [__USE_MISC]: Define __need_timespec for struct stat.
	* sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Adjust for
	nsec resolution changes.
	(xstat64_conv): Likewise.
	(xstat32_conv): Likewise.
	* sysdeps/unix/sysv/linux/kernel_stat.h: Add nsec resolution for
	struct kernel_stat.
	* sysdeps/unix/sysv/linux/bits/stat.h: Add nsec resolution for
	structs stat and stat64.
	* time/time.h (__timespec_defined): Define for __USE_MISC.

2002-12-31  Ulrich Drepper  <drepper@redhat.com>

	* include/signal.h: Add libc_hidden_proto for __libc_current_sigrtmin
	and __libc_current_sigrtmax.

2002-12-31  Jakub Jelinek  <jakub@redhat.com>

	* include/errno.h (__errno_location): Add prototype.
	Use libc_hidden_proto unconditionally.
	* include/netdb.h (__h_errno_location): Use libc_hidden_proto
	unconditionally.
	* include/resolv.h (__res_state): Likewise.

	* hurd/errno-loc.c (__errno_location): Add libc_hidden_def.
	* include/sys/socket.h (accept): Add libc_hidden_proto.
	* include/errno.h (__errno_location): Likewise.
	* include/netdb.h (__h_errno_location): Likewise.
	* include/resolv.h (__res_state): Likewise.
	* include/unistd.h (__lseek): Likewise.
	* sysdeps/generic/errno-loc.c (__errno_location): Add libc_hidden_def.
	* sysdeps/generic/herrno-loc.c (__h_errno_location): Likewise.
	* sysdeps/generic/res-state.c (__res_state): Likewise.
	* sysdeps/generic/accept.c (accept): Likewise.
	* sysdeps/generic/lseek.c (__lseek): Likewise.
	* sysdeps/generic/allocrtsig.c (__libc_current_sigrtmin,
	__libc_current_sigrtmax): Likewise.
	* sysdeps/mach/hurd/accept.c (accept): Likewise.
	* sysdeps/mach/hurd/lseek.c (__lseek): Likewise.
	* sysdeps/unix/sysv/aix/accept.c (accept): Likewise.
	* sysdeps/unix/sysv/aix/lseek.c (__lseek): Likewise.
	* sysdeps/unix/sysv/linux/accept.S (accept): Likewise.
	* sysdeps/unix/inet/syscalls.list (__GI_accept): New alias to accept.
	* sysdeps/unix/sysv/linux/alpha/syscalls.list (__GI_accept): Likewise.
	* sysdeps/unix/sysv/linux/hppa/syscalls.list (__GI_accept): Likewise.
	* sysdeps/unix/sysv/linux/ia64/syscalls.list (__GI___lseek): New
	alias to llseek.
	(__GI_accept): New alias to accept.
	* sysdeps/unix/sysv/linux/mips/syscalls.list (__GI_accept): Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__GI___lseek):
	New alias to llseek.
	(__GI_accept): New alias to accept.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (__GI_accept):
	Likewise.
	* sysdeps/unix/sysv/linux/x86_64/syscalls.list (__GI_accept):
	Likewise.
	* sysdeps/unix/syscalls.list (__GI___lseek): New alias to lseek.

	* sysdeps/alpha/setjmp.S : Use libc_hidden_def(name) instead of
	strong_alias (name, __GI_name).
	* sysdeps/arm/bsd-_setjmp.S : Likewise.
	* sysdeps/hppa/bsd-_setjmp.S : Likewise.
	* sysdeps/i386/bsd-_setjmp.S : Likewise.
	* sysdeps/mips/mips64/bsd-_setjmp.S : Likewise.
	* sysdeps/mips/bsd-_setjmp.S : Likewise.
	* sysdeps/powerpc/powerpc32/bsd-_setjmp.S : Likewise.
	* sysdeps/powerpc/powerpc64/setjmp.S : Likewise.
	* sysdeps/s390/s390-32/elf/setjmp.S : Likewise.
	* sysdeps/s390/s390-32/bsd-_setjmp.S : Likewise.
	* sysdeps/s390/s390-64/elf/setjmp.S : Likewise.
	* sysdeps/s390/s390-64/bsd-_setjmp.S : Likewise.
	* sysdeps/sh/bsd-_setjmp.S : Likewise.
	* sysdeps/sparc/sparc32/setjmp.S : Likewise.
	* sysdeps/unix/arm/fork.S : Likewise.
	* sysdeps/unix/bsd/hp/m68k/vfork.S : Likewise.
	* sysdeps/unix/bsd/i386/vfork.S : Likewise.
	* sysdeps/unix/bsd/osf/alpha/fork.S : Likewise.
	* sysdeps/unix/bsd/sun/m68k/vfork.S : Likewise.
	* sysdeps/unix/bsd/ultrix4/mips/vfork.S : Likewise.
	* sysdeps/unix/bsd/vax/vfork.S : Likewise.
	* sysdeps/unix/i386/fork.S : Likewise.
	* sysdeps/unix/mips/fork.S : Likewise.
	* sysdeps/unix/sparc/fork.S : Likewise.
	* sysdeps/unix/sparc/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/arm/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/cris/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/i386/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/ia64/fork.S : Likewise.
	* sysdeps/unix/sysv/linux/ia64/setjmp.S : Likewise.
	* sysdeps/unix/sysv/linux/ia64/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/m68k/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/sh/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S : Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S : Likewise.
	* sysdeps/unix/sysv/linux/sparc/fork.S : Likewise.
	* sysdeps/unix/sysv/linux/sparc/vfork.S : Likewise.
	* sysdeps/unix/sysv/linux/x86_64/vfork.S : Likewise.
	* sysdeps/unix/fork.S : Likewise.
	* sysdeps/vax/bsd-_setjmp.S : Likewise.
	* sysdeps/x86_64/bsd-_setjmp.S : Likewise.

	* sysdeps/unix/sysv/linux/ia64/sysdep.h: Guard against multiple
	inclusion.

89 files changed, 253 insertions, 99 deletions

diff --git a/ChangeLog b/ChangeLog
index 481ac7c1c2..0623e2056e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,21 +20,113 @@
 	* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
 	* sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
 
-        * io/sys/stat.h [__USE_MISC]: Define __need_timespec for struct
-        stat.
+	* io/sys/stat.h [__USE_MISC]: Define __need_timespec for struct stat.
 
-        * sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Adjust for
-        nsec resolution changes.
-        (xstat64_conv): Likewise.
-        (xstat32_conv): Likewise.
+	* sysdeps/unix/sysv/linux/xstatconv.c (xstat_conv): Adjust for
+	nsec resolution changes.
+	(xstat64_conv): Likewise.
+	(xstat32_conv): Likewise.
 
-        * sysdeps/unix/sysv/linux/kernel_stat.h: Add nsec resolution for
-        struct kernel_stat.
+	* sysdeps/unix/sysv/linux/kernel_stat.h: Add nsec resolution for
+	struct kernel_stat.
 
-        * sysdeps/unix/sysv/linux/bits/stat.h: Add nsec resolution for
-        structs stat and stat64.
+	* sysdeps/unix/sysv/linux/bits/stat.h: Add nsec resolution for
+	structs stat and stat64.
 
-        * time/time.h (__timespec_defined): Define for __USE_MISC.
+	* time/time.h (__timespec_defined): Define for __USE_MISC.
+
+2002-12-31  Ulrich Drepper  <drepper@redhat.com>
+
+	* include/signal.h: Add libc_hidden_proto for __libc_current_sigrtmin
+	and __libc_current_sigrtmax.
+
+2002-12-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* include/errno.h (__errno_location): Add prototype.
+	Use libc_hidden_proto unconditionally.
+	* include/netdb.h (__h_errno_location): Use libc_hidden_proto
+	unconditionally.
+	* include/resolv.h (__res_state): Likewise.
+
+	* hurd/errno-loc.c (__errno_location): Add libc_hidden_def.
+	* include/sys/socket.h (accept): Add libc_hidden_proto.
+	* include/errno.h (__errno_location): Likewise.
+	* include/netdb.h (__h_errno_location): Likewise.
+	* include/resolv.h (__res_state): Likewise.
+	* include/unistd.h (__lseek): Likewise.
+	* sysdeps/generic/errno-loc.c (__errno_location): Add libc_hidden_def.
+	* sysdeps/generic/herrno-loc.c (__h_errno_location): Likewise.
+	* sysdeps/generic/res-state.c (__res_state): Likewise.
+	* sysdeps/generic/accept.c (accept): Likewise.
+	* sysdeps/generic/lseek.c (__lseek): Likewise.
+	* sysdeps/generic/allocrtsig.c (__libc_current_sigrtmin,
+	__libc_current_sigrtmax): Likewise.
+	* sysdeps/mach/hurd/accept.c (accept): Likewise.
+	* sysdeps/mach/hurd/lseek.c (__lseek): Likewise.
+	* sysdeps/unix/sysv/aix/accept.c (accept): Likewise.
+	* sysdeps/unix/sysv/aix/lseek.c (__lseek): Likewise.
+	* sysdeps/unix/sysv/linux/accept.S (accept): Likewise.
+	* sysdeps/unix/inet/syscalls.list (__GI_accept): New alias to accept.
+	* sysdeps/unix/sysv/linux/alpha/syscalls.list (__GI_accept): Likewise.
+	* sysdeps/unix/sysv/linux/hppa/syscalls.list (__GI_accept): Likewise.
+	* sysdeps/unix/sysv/linux/ia64/syscalls.list (__GI___lseek): New
+	alias to llseek.
+	(__GI_accept): New alias to accept.
+	* sysdeps/unix/sysv/linux/mips/syscalls.list (__GI_accept): Likewise.
+	* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (__GI___lseek):
+	New alias to llseek.
+	(__GI_accept): New alias to accept.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (__GI_accept):
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/syscalls.list (__GI_accept):
+	Likewise.
+	* sysdeps/unix/syscalls.list (__GI___lseek): New alias to lseek.
+
+	* sysdeps/alpha/setjmp.S : Use libc_hidden_def(name) instead of
+	strong_alias (name, __GI_name).
+	* sysdeps/arm/bsd-_setjmp.S : Likewise.
+	* sysdeps/hppa/bsd-_setjmp.S : Likewise.
+	* sysdeps/i386/bsd-_setjmp.S : Likewise.
+	* sysdeps/mips/mips64/bsd-_setjmp.S : Likewise.
+	* sysdeps/mips/bsd-_setjmp.S : Likewise.
+	* sysdeps/powerpc/powerpc32/bsd-_setjmp.S : Likewise.
+	* sysdeps/powerpc/powerpc64/setjmp.S : Likewise.
+	* sysdeps/s390/s390-32/elf/setjmp.S : Likewise.
+	* sysdeps/s390/s390-32/bsd-_setjmp.S : Likewise.
+	* sysdeps/s390/s390-64/elf/setjmp.S : Likewise.
+	* sysdeps/s390/s390-64/bsd-_setjmp.S : Likewise.
+	* sysdeps/sh/bsd-_setjmp.S : Likewise.
+	* sysdeps/sparc/sparc32/setjmp.S : Likewise.
+	* sysdeps/unix/arm/fork.S : Likewise.
+	* sysdeps/unix/bsd/hp/m68k/vfork.S : Likewise.
+	* sysdeps/unix/bsd/i386/vfork.S : Likewise.
+	* sysdeps/unix/bsd/osf/alpha/fork.S : Likewise.
+	* sysdeps/unix/bsd/sun/m68k/vfork.S : Likewise.
+	* sysdeps/unix/bsd/ultrix4/mips/vfork.S : Likewise.
+	* sysdeps/unix/bsd/vax/vfork.S : Likewise.
+	* sysdeps/unix/i386/fork.S : Likewise.
+	* sysdeps/unix/mips/fork.S : Likewise.
+	* sysdeps/unix/sparc/fork.S : Likewise.
+	* sysdeps/unix/sparc/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/arm/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/cris/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/i386/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/ia64/fork.S : Likewise.
+	* sysdeps/unix/sysv/linux/ia64/setjmp.S : Likewise.
+	* sysdeps/unix/sysv/linux/ia64/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/m68k/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/sh/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S : Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S : Likewise.
+	* sysdeps/unix/sysv/linux/sparc/fork.S : Likewise.
+	* sysdeps/unix/sysv/linux/sparc/vfork.S : Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/vfork.S : Likewise.
+	* sysdeps/unix/fork.S : Likewise.
+	* sysdeps/vax/bsd-_setjmp.S : Likewise.
+	* sysdeps/x86_64/bsd-_setjmp.S : Likewise.
+
+	* sysdeps/unix/sysv/linux/ia64/sysdep.h: Guard against multiple
+	inclusion.
 
 2002-12-31  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/hurd/errno-loc.c b/hurd/errno-loc.c
index 85e4e7d47b..9ff09ebb60 100644
--- a/hurd/errno-loc.c
+++ b/hurd/errno-loc.c
@@ -26,3 +26,4 @@ __errno_location (void)
   return (int *) __hurd_threadvar_location (_HURD_THREADVAR_ERRNO);
 }
 strong_alias (__errno_location, __hurd_errno_location)
+libc_hidden_def (__errno_location)
diff --git a/include/errno.h b/include/errno.h
index 05888c1363..1b0aabc690 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -35,6 +35,11 @@ extern __thread int errno attribute_tls_model_ie;
 
 # define __set_errno(val) (errno = (val))
 
+# ifndef __ASSEMBLER__
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+libc_hidden_proto (__errno_location)
+# endif
+
 #endif /* _ERRNO_H */
 
 #endif /* ! _ERRNO_H */
diff --git a/include/netdb.h b/include/netdb.h
index 54cdda1eea..7b446058a1 100644
--- a/include/netdb.h
+++ b/include/netdb.h
@@ -37,6 +37,7 @@ libc_hidden_proto (getaddrinfo)
 libc_hidden_proto (getnameinfo)
 libc_hidden_proto (freeaddrinfo)
 libc_hidden_proto (gai_strerror)
+libc_hidden_proto (__h_errno_location)
 
 /* Document internal interfaces.  */
 extern int __gethostent_r (struct hostent *__restrict __result_buf,
diff --git a/include/resolv.h b/include/resolv.h
index 8b5b852647..f9635dd87d 100644
--- a/include/resolv.h
+++ b/include/resolv.h
@@ -46,6 +46,7 @@ extern int res_ourserver_p (const res_state __statp,
 			    const struct sockaddr_in6 *__inp);
 libc_hidden_proto (__res_ninit)
 libc_hidden_proto (__res_randomid)
+libc_hidden_proto (__res_state)
 
 int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,
 		       u_char **);
diff --git a/include/signal.h b/include/signal.h
index 0b6aef6522..b03b1a3ec4 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -9,6 +9,8 @@ libc_hidden_proto (sigfillset)
 libc_hidden_proto (sigismember)
 libc_hidden_proto (__sigpause)
 libc_hidden_proto (raise)
+libc_hidden_proto (__libc_current_sigrtmin)
+libc_hidden_proto (__libc_current_sigrtmax)
 
 /* Now define the internal interfaces.  */
 extern __sighandler_t __bsd_signal (int __sig, __sighandler_t __handler);
diff --git a/include/sys/socket.h b/include/sys/socket.h
index f943e9b80b..05798095f8 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -118,6 +118,7 @@ extern int __listen (int __fd, int __n) attribute_hidden;
 extern int __libc_accept (int __fd, __SOCKADDR_ARG __addr,
 			  socklen_t *__restrict __addr_len)
      __THROW;
+libc_hidden_proto (accept)
 
 /* Return the length of a `sockaddr' structure.  */
 #ifdef _HAVE_SA_LEN
diff --git a/include/unistd.h b/include/unistd.h
index 7481af7bc7..eba14514c1 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -21,6 +21,7 @@ extern int __access (__const char *__name, int __type);
 extern int __euidaccess (__const char *__name, int __type);
 extern __off64_t __lseek64 (int __fd, __off64_t __offset, int __whence);
 extern __off_t __lseek (int __fd, __off_t __offset, int __whence);
+libc_hidden_proto (__lseek)
 extern __off_t __libc_lseek (int __fd, __off_t __offset, int __whence);
 extern __off64_t __libc_lseek64 (int __fd, __off64_t __offset, int __whence);
 extern ssize_t __pread (int __fd, void *__buf, size_t __nbytes,
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 16e26d8950..fafea62907 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,5 +1,29 @@
 2002-12-31  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/i386/i686/pt-machine.h: Use __ASSEMBLER__ instead of
+	ASSEMBLER test macro.
+	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Likewise.
+	* sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h: Likewise.
+	* sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h: Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h: Likewise.
+
+	* sysdeps/pthread/errno-loc.c (__errno_location): Add
+	libc_hidden_def.
+	* sysdeps/pthread/herrno-loc.c (__h_errno_location): Likewise.
+	* sysdeps/pthread/res-state.c (__res_state): Likewise.
+	* sysdeps/unix/sysv/linux/allocrtsig.c (__libc_current_sigrtmin,
+	__libc_current_sigrtmax): Likewise.
+	* Versions [libc] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get,
+	__libc_internal_tsd_set, __libc_internal_tsd_address,
+	__libc_alloca_cutoff.
+	[libpthread] (GLIBC_PRIVATE): Remove __libc_internal_tsd_get,
+	__libc_internal_tsd_set, __libc_internal_tsd_address.
+
+	* sysdeps/pthread/list.h: Remove assert.h include.
+	* sysdeps/unix/sysv/linux/fork.c: Include <fork.h>, not "fork.h".
+
 	* sysdeps/pthread/list.h: New file.
 	* sysdeps/unix/sysv/linux/jmp-unwind.c: New file.
 	* sysdeps/unix/sysv/linux/fork.c: New file.
diff --git a/linuxthreads/sysdeps/i386/i686/pt-machine.h b/linuxthreads/sysdeps/i386/i686/pt-machine.h
index 3596224c12..3c28118f2e 100644
--- a/linuxthreads/sysdeps/i386/i686/pt-machine.h
+++ b/linuxthreads/sysdeps/i386/i686/pt-machine.h
@@ -27,7 +27,7 @@
 #endif
 #include "kernel-features.h"
 
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 extern long int testandset (int *spinlock);
 extern int __compare_and_swap (long int *p, long int oldval, long int newval);
 
diff --git a/linuxthreads/sysdeps/pthread/errno-loc.c b/linuxthreads/sysdeps/pthread/errno-loc.c
index e79a7cf814..86dca2829e 100644
--- a/linuxthreads/sysdeps/pthread/errno-loc.c
+++ b/linuxthreads/sysdeps/pthread/errno-loc.c
@@ -42,3 +42,4 @@ __errno_location (void)
 #endif
   return &errno;
 }
+libc_hidden_def (__errno_location)
diff --git a/linuxthreads/sysdeps/pthread/herrno-loc.c b/linuxthreads/sysdeps/pthread/herrno-loc.c
index ead9a16065..24712c706d 100644
--- a/linuxthreads/sysdeps/pthread/herrno-loc.c
+++ b/linuxthreads/sysdeps/pthread/herrno-loc.c
@@ -39,3 +39,4 @@ __h_errno_location (void)
 #endif
   return &h_errno;
 }
+libc_hidden_def (__h_errno_location)
diff --git a/linuxthreads/sysdeps/pthread/list.h b/linuxthreads/sysdeps/pthread/list.h
index 1d6a4cfa65..43186a2d51 100644
--- a/linuxthreads/sysdeps/pthread/list.h
+++ b/linuxthreads/sysdeps/pthread/list.h
@@ -20,8 +20,6 @@
 #ifndef _LIST_H
 #define _LIST_H	1
 
-#include <assert.h>
-
 /* The definitions of this file are adopted from those which can be
    found in the Linux kernel headers to enable people familiar with
    the latter find their way in these sources as well.  */
diff --git a/linuxthreads/sysdeps/pthread/res-state.c b/linuxthreads/sysdeps/pthread/res-state.c
index 90fe41c80b..afa48b89ff 100644
--- a/linuxthreads/sysdeps/pthread/res-state.c
+++ b/linuxthreads/sysdeps/pthread/res-state.c
@@ -41,3 +41,4 @@ __res_state (void)
 #endif
   return &_res;
 }
+libc_hidden_def (__res_state)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c b/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
index a18753233a..af1581a4c3 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/allocrtsig.c
@@ -57,6 +57,7 @@ __libc_current_sigrtmin (void)
   return current_rtmin;
 }
 strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private);
+libc_hidden_def (__libc_current_sigrtmin)
 
 /* Return number of available real-time signal with lowest priority.  */
 int
@@ -67,6 +68,7 @@ __libc_current_sigrtmax (void)
   return current_rtmax;
 }
 strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private);
+libc_hidden_def (__libc_current_sigrtmax)
 
 /* Allocate real-time signal with highest/lowest available
    priority.  Please note that we don't use a lock since we assume
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/fork.c b/linuxthreads/sysdeps/unix/sysv/linux/fork.c
index c519fa0677..49f1b088c5 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/fork.c
+++ b/linuxthreads/sysdeps/unix/sysv/linux/fork.c
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <errno.h>
-#include "fork.h"
+#include <fork.h>
 #include <bits/libc-lock.h>
 
 weak_extern (__pthread_fork);
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index c2455a7464..6189b7b152 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -20,7 +20,7 @@
 #include <sysdep.h>
 #include <tls.h>
 #include <pt-machine.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -83,7 +83,7 @@
 # define __local_multiple_threads __pthread_multiple_threads
 #endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  if defined FLOATING_STACKS && USE___THREAD && defined PIC
 #   define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
@@ -112,7 +112,7 @@ extern int __local_multiple_threads attribute_hidden;
 #  endif
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
index 723c2e4117..ec787da31c 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/ia64/sysdep-cancel.h
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -99,7 +99,7 @@ __syscall_error_##args:							      \
 #define COPY_ARGS_6	COPY_ARGS_5 mov out5 = in5;
 #define COPY_ARGS_7	COPY_ARGS_6 mov out6 = in6;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -108,7 +108,7 @@ __syscall_error_##args:							      \
   adds r14 = MULTIPLE_THREADS_OFFSET, r13 ;; ld4 r14 = [r14] ;; cmp4.ne p6, p7 = 0, r14 ;;
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
index fb6e92c37a..2711c222d4 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/m68k/sysdep-cancel.h
@@ -18,7 +18,7 @@
    02111-1307 USA.  */
 
 #include <sysdep.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -90,7 +90,7 @@
 #  define __local_multiple_threads __pthread_multiple_threads
 # endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 extern int __local_multiple_threads attribute_hidden;
 #  define SINGLE_THREAD_P __builtin_expect (__local_multiple_threads == 0, 1)
 # else
@@ -107,7 +107,7 @@ extern int __local_multiple_threads attribute_hidden;
 #  endif
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
index f6afb81373..66aaeabdde 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep-cancel.h
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -81,7 +81,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 #define COPY_ARGS_5	COPY_ARGS_4 mov %i4, %o4;
 #define COPY_ARGS_6	COPY_ARGS_5 mov %i5, %o5;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -89,7 +89,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 #  define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
index d236bf33b7..7d4f9b5ea8 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/sparc/sparc64/sysdep-cancel.h
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -80,7 +80,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 #define COPY_ARGS_5	COPY_ARGS_4 mov %i4, %o4;
 #define COPY_ARGS_6	COPY_ARGS_5 mov %i5, %o5;
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -88,7 +88,7 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler2)			      \
 #  define SINGLE_THREAD_P ld [%g6 + MULTIPLE_THREADS_OFFSET], %g1
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
index 1c7a95dcd8..ca8183f4e9 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
+++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/sysdep-cancel.h
@@ -20,7 +20,7 @@
 #include <sysdep.h>
 #include <tls.h>
 #include <pt-machine.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <linuxthreads/internals.h>
 #endif
 
@@ -102,7 +102,7 @@
 #  define __local_multiple_threads __libc_multiple_threads
 # endif
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 extern int __local_multiple_threads attribute_hidden;
 #   define SINGLE_THREAD_P \
   __builtin_expect (__local_multiple_threads == 0, 1)
@@ -110,7 +110,7 @@ extern int __local_multiple_threads attribute_hidden;
 #  define SINGLE_THREAD_P cmpl $0, __local_multiple_threads(%rip)
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1194982767..6eb17e4fcb 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,13 @@
+2002-12-31  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/i386/sysdep-cancel.h: Use __ASSEMBLER__
+	instead of ASSEMBLER test macro.
+
+	* sysdeps/unix/sysv/linux/allocrtsig.c (__libc_current_sigrtmin,
+	__libc_current_sigrtmax): Add libc_hidden_def.
+
+	* sysdeps/pthread/list.h: Remove assert.h include.
+
 2002-12-31  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/pthread/pt-initfini.c (call_initialize_minimal): Use
diff --git a/nptl/sysdeps/pthread/list.h b/nptl/sysdeps/pthread/list.h
index 1d6a4cfa65..43186a2d51 100644
--- a/nptl/sysdeps/pthread/list.h
+++ b/nptl/sysdeps/pthread/list.h
@@ -20,8 +20,6 @@
 #ifndef _LIST_H
 #define _LIST_H	1
 
-#include <assert.h>
-
 /* The definitions of this file are adopted from those which can be
    found in the Linux kernel headers to enable people familiar with
    the latter find their way in these sources as well.  */
diff --git a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c
index 5badaea9ec..e3622c6076 100644
--- a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c
+++ b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c
@@ -31,6 +31,7 @@ __libc_current_sigrtmin (void)
 {
   return current_rtmin;
 }
+libc_hidden_def (__libc_current_sigrtmin)
 strong_alias (__libc_current_sigrtmin, __libc_current_sigrtmin_private)
 
 
@@ -39,6 +40,7 @@ __libc_current_sigrtmax (void)
 {
   return current_rtmax;
 }
+libc_hidden_def (__libc_current_sigrtmax)
 strong_alias (__libc_current_sigrtmax, __libc_current_sigrtmax_private)
 
 
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
index 9a3cb04d73..d9b51a4da5 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #include <tls.h>
-#ifndef ASSEMBLER
+#ifndef __ASSEMBLER__
 # include <nptl/pthreadP.h>
 #endif
 
@@ -76,7 +76,7 @@
 # define POPCARGS_4	POPCARGS_2
 # define POPCARGS_5	POPCARGS_2
 
-# ifndef ASSEMBLER
+# ifndef __ASSEMBLER__
 #  define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   header.data.multiple_threads) == 0, 1)
@@ -84,7 +84,7 @@
 #  define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
 # endif
 
-#elif !defined ASSEMBLER
+#elif !defined __ASSEMBLER__
 
 /* This code should never be used but we define it anyhow.  */
 # define SINGLE_THREAD_P (1)
diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index 5752da7975..2e38f0031d 100644
--- a/sysdeps/alpha/setjmp.S
+++ b/sysdeps/alpha/setjmp.S
@@ -77,7 +77,7 @@ ENTRY(_setjmp)
 	mov	0, a1
 	br	$sigsetjmp_local
 END(_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 
 ENTRY(setjmp)
 	ldgp	gp, 0(pv)
diff --git a/sysdeps/arm/bsd-_setjmp.S b/sysdeps/arm/bsd-_setjmp.S
index ac039ca772..c4a094e505 100644
--- a/sysdeps/arm/bsd-_setjmp.S
+++ b/sysdeps/arm/bsd-_setjmp.S
@@ -27,4 +27,4 @@ ENTRY (_setjmp)
 	mov	r1, #0
 	b	PLTJMP(C_SYMBOL_NAME(__sigsetjmp))
 END (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/generic/accept.c b/sysdeps/generic/accept.c
index b6ea14ee00..dad34ceddd 100644
--- a/sysdeps/generic/accept.c
+++ b/sysdeps/generic/accept.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -33,6 +33,7 @@ accept (fd, addr, addr_len)
   __set_errno (ENOSYS);
   return -1;
 }
+libc_hidden_def (accept)
 
 
 stub_warning (accept)
diff --git a/sysdeps/generic/allocrtsig.c b/sysdeps/generic/allocrtsig.c
index d8d8943152..ac8d2b6bfe 100644
--- a/sysdeps/generic/allocrtsig.c
+++ b/sysdeps/generic/allocrtsig.c
@@ -62,6 +62,7 @@ __libc_current_sigrtmin (void)
 #endif
   return current_rtmin;
 }
+libc_hidden_def (__libc_current_sigrtmin)
 
 /* Return number of available real-time signal with lowest priority.  */
 int
@@ -73,6 +74,7 @@ __libc_current_sigrtmax (void)
 #endif
   return current_rtmax;
 }
+libc_hidden_def (__libc_current_sigrtmax)
 
 /* Allocate real-time signal with highest/lowest available
    priority.  Please note that we don't use a lock since we assume
diff --git a/sysdeps/generic/errno-loc.c b/sysdeps/generic/errno-loc.c
index 8332a46ad7..fd16103b11 100644
--- a/sysdeps/generic/errno-loc.c
+++ b/sysdeps/generic/errno-loc.c
@@ -34,3 +34,4 @@ __errno_location (void)
 {
   return &errno;
 }
+libc_hidden_def (__errno_location)
diff --git a/sysdeps/generic/herrno-loc.c b/sysdeps/generic/herrno-loc.c
index deb1676dbc..fd6deeb330 100644
--- a/sysdeps/generic/herrno-loc.c
+++ b/sysdeps/generic/herrno-loc.c
@@ -31,3 +31,4 @@ __h_errno_location (void)
 {
   return &h_errno;
 }
+libc_hidden_def (__h_errno_location)
diff --git a/sysdeps/generic/lseek.c b/sysdeps/generic/lseek.c
index adf425be61..6daf6ef154 100644
--- a/sysdeps/generic/lseek.c
+++ b/sysdeps/generic/lseek.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 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
@@ -47,6 +47,7 @@ __lseek (fd, offset, whence)
   return -1;
 }
 stub_warning (lseek)
+libc_hidden_def (__lseek)
 
 weak_alias (__lseek, lseek)
 #include <stub-tag.h>
diff --git a/sysdeps/generic/res-state.c b/sysdeps/generic/res-state.c
index ec9951e82f..0c2cb6c948 100644
--- a/sysdeps/generic/res-state.c
+++ b/sysdeps/generic/res-state.c
@@ -33,3 +33,4 @@ __res_state (void)
 {
   return &_res;
 }
+libc_hidden_def (__res_state)
diff --git a/sysdeps/hppa/bsd-_setjmp.S b/sysdeps/hppa/bsd-_setjmp.S
index 31aceb0703..e5ec94c122 100644
--- a/sysdeps/hppa/bsd-_setjmp.S
+++ b/sysdeps/hppa/bsd-_setjmp.S
@@ -36,4 +36,4 @@ _setjmp:
 	ldi	0, %r25
 
 	.procend
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index d3237da22e..6b590f7f04 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -1,5 +1,5 @@
 /* longjmp for i386.
-   Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 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
diff --git a/sysdeps/i386/bsd-_setjmp.S b/sysdeps/i386/bsd-_setjmp.S
index 364525b168..aa8df167d0 100644
--- a/sysdeps/i386/bsd-_setjmp.S
+++ b/sysdeps/i386/bsd-_setjmp.S
@@ -53,4 +53,4 @@ ENTRY (BP_SYM (_setjmp))
 	movl %eax, JB_SIZE(%edx) /* No signal mask set.  */
 	ret
 END (BP_SYM (_setjmp))
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/mach/hurd/accept.c b/sysdeps/mach/hurd/accept.c
index af6c395938..362c42c5be 100644
--- a/sysdeps/mach/hurd/accept.c
+++ b/sysdeps/mach/hurd/accept.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1993, 1994, 1997, 1999 Free Software Foundation, Inc.
+/* Copyright (C) 1992,1993,1994,1997,1999,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
@@ -84,3 +84,4 @@ accept (fd, addrarg, addr_len)
 
   return _hurd_intern_fd (new, O_IGNORE_CTTY, 1);
 }
+libc_hidden_def (accept)
diff --git a/sysdeps/mach/hurd/lseek.c b/sysdeps/mach/hurd/lseek.c
index 87cc69d9ef..e4b70b3fa2 100644
--- a/sysdeps/mach/hurd/lseek.c
+++ b/sysdeps/mach/hurd/lseek.c
@@ -27,4 +27,5 @@ __libc_lseek (int fd, off_t offset, int whence)
 }
 
 weak_alias (__libc_lseek, __lseek)
+libc_hidden_def (__lseek)
 weak_alias (__libc_lseek, lseek)
diff --git a/sysdeps/mips/bsd-_setjmp.S b/sysdeps/mips/bsd-_setjmp.S
index a175a9c820..5e3ad50305 100644
--- a/sysdeps/mips/bsd-_setjmp.S
+++ b/sysdeps/mips/bsd-_setjmp.S
@@ -40,4 +40,4 @@ ENTRY (_setjmp)
 	j	C_SYMBOL_NAME (__sigsetjmp)
 #endif
 	.end	_setjmp
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/mips/mips64/bsd-_setjmp.S b/sysdeps/mips/mips64/bsd-_setjmp.S
index 489bcef528..c0ff0d7621 100644
--- a/sysdeps/mips/mips64/bsd-_setjmp.S
+++ b/sysdeps/mips/mips64/bsd-_setjmp.S
@@ -34,4 +34,4 @@ ENTRY (_setjmp)
 	nop
 	jr t9
 	dli a1, 0		/* Pass a second argument of zero.  */
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
index d5ba978635..ce05f4ac91 100644
--- a/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
+++ b/sysdeps/powerpc/powerpc32/bsd-_setjmp.S
@@ -28,4 +28,4 @@ ENTRY (BP_SYM (_setjmp))
 	li r4,0			/* Set second argument to 0.  */
 	b JUMPTARGET(BP_SYM (__sigsetjmp))
 END (BP_SYM (_setjmp))
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64/setjmp.S
index e48c232172..4ee6c9447a 100644
--- a/sysdeps/powerpc/powerpc64/setjmp.S
+++ b/sysdeps/powerpc/powerpc64/setjmp.S
@@ -77,7 +77,7 @@ ENTRY (BP_SYM (_setjmp))
 	li r4,0			/* Set second argument to 0.  */
 	b	___sigsetjmp
 END (BP_SYM (_setjmp))
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 
 ENTRY (BP_SYM (__setjmp))
 	li r4,1			/* Set second argument to 1.  */
diff --git a/sysdeps/s390/s390-32/bsd-_setjmp.S b/sysdeps/s390/s390-32/bsd-_setjmp.S
index 2f703e0c1b..01c349d181 100644
--- a/sysdeps/s390/s390-32/bsd-_setjmp.S
+++ b/sysdeps/s390/s390-32/bsd-_setjmp.S
@@ -44,4 +44,4 @@ ENTRY(_setjmp)
 .L1:    .long  __sigsetjmp
 #endif
 END (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/s390/s390-32/elf/setjmp.S b/sysdeps/s390/s390-32/elf/setjmp.S
index 6cc02bd361..f785201d75 100644
--- a/sysdeps/s390/s390-32/elf/setjmp.S
+++ b/sysdeps/s390/s390-32/elf/setjmp.S
@@ -34,7 +34,7 @@ END (setjmp)
 	/* Binary compatibility entry point.  */
 ENTRY(_setjmp)
 	.weak  C_SYMBOL_NAME (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 ENTRY(__setjmp)
 	lhi    %r3,0                /* second argument of zero */
 
diff --git a/sysdeps/s390/s390-64/bsd-_setjmp.S b/sysdeps/s390/s390-64/bsd-_setjmp.S
index 095443ac0d..78c6563b66 100644
--- a/sysdeps/s390/s390-64/bsd-_setjmp.S
+++ b/sysdeps/s390/s390-64/bsd-_setjmp.S
@@ -32,4 +32,4 @@ ENTRY(_setjmp)
 	jg     __sigsetjmp	    /* Branch to __sigsetjmp.  */
 #endif
 END (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/s390/s390-64/elf/setjmp.S b/sysdeps/s390/s390-64/elf/setjmp.S
index 94f6bba043..657514d0f0 100644
--- a/sysdeps/s390/s390-64/elf/setjmp.S
+++ b/sysdeps/s390/s390-64/elf/setjmp.S
@@ -34,7 +34,7 @@ END (setjmp)
 	/* Binary compatibility entry point.  */
 ENTRY(_setjmp)
         .weak  C_SYMBOL_NAME (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 ENTRY(__setjmp)
         slgr   %r3,%r3              /* Second argument of zero.  */
 
diff --git a/sysdeps/sh/bsd-_setjmp.S b/sysdeps/sh/bsd-_setjmp.S
index cf86b0f101..2811fcfd1b 100644
--- a/sysdeps/sh/bsd-_setjmp.S
+++ b/sysdeps/sh/bsd-_setjmp.S
@@ -49,4 +49,4 @@ ENTRY (_setjmp)
 	.long	C_SYMBOL_NAME(__sigsetjmp)
 #endif
 END (_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/sparc/sparc32/setjmp.S b/sysdeps/sparc/sparc32/setjmp.S
index 5d61c18276..883ea06297 100644
--- a/sysdeps/sparc/sparc32/setjmp.S
+++ b/sysdeps/sparc/sparc32/setjmp.S
@@ -27,7 +27,7 @@ ENTRY(_setjmp)
 	b	1f
 	 set	0, %o1
 END(_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 
 ENTRY(setjmp)
 	set	1, %o1
diff --git a/sysdeps/unix/arm/fork.S b/sysdeps/unix/arm/fork.S
index 19981451b6..b317b66a97 100644
--- a/sysdeps/unix/arm/fork.S
+++ b/sysdeps/unix/arm/fork.S
@@ -29,6 +29,6 @@ SYSCALL__ (fork, 0)
 	and r0, r0, r1
 	RETINSTR(mov, pc, r14)
 PSEUDO_END (__fork)
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/bsd/hp/m68k/vfork.S b/sysdeps/unix/bsd/hp/m68k/vfork.S
index 0e15a5089d..abcc1c3389 100644
--- a/sysdeps/unix/bsd/hp/m68k/vfork.S
+++ b/sysdeps/unix/bsd/hp/m68k/vfork.S
@@ -51,6 +51,6 @@ error:
 	movel d0, _errno
 	moveq #-1, d0
 	jmp a0@
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/i386/vfork.S b/sysdeps/unix/bsd/i386/vfork.S
index dfcbe48821..a245f3e141 100644
--- a/sysdeps/unix/bsd/i386/vfork.S
+++ b/sysdeps/unix/bsd/i386/vfork.S
@@ -35,6 +35,6 @@ ENTRY (__vfork)
 	decl r1
 	andl r1, r0
 	ret
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/osf/alpha/fork.S b/sysdeps/unix/bsd/osf/alpha/fork.S
index 13b12239ba..a4ec14b56f 100644
--- a/sysdeps/unix/bsd/osf/alpha/fork.S
+++ b/sysdeps/unix/bsd/osf/alpha/fork.S
@@ -23,6 +23,6 @@ SYSCALL__ (fork, 0)
 	cmovne a4, 0, v0
 	ret
 	.end __fork
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/bsd/sun/m68k/vfork.S b/sysdeps/unix/bsd/sun/m68k/vfork.S
index 006688936b..cf9e2e9e1a 100644
--- a/sysdeps/unix/bsd/sun/m68k/vfork.S
+++ b/sysdeps/unix/bsd/sun/m68k/vfork.S
@@ -51,6 +51,6 @@ error:
 	movel d0, _errno
 	moveq #-1, d0
 	jmp a0@
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/ultrix4/mips/vfork.S b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
index 80e7328c71..d413e45dc1 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/vfork.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
@@ -31,6 +31,6 @@ parent:
 	ret
 	nop
 	.end __vfork
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/vax/vfork.S b/sysdeps/unix/bsd/vax/vfork.S
index 16f0e98bb2..6c7e754ac7 100644
--- a/sysdeps/unix/bsd/vax/vfork.S
+++ b/sysdeps/unix/bsd/vax/vfork.S
@@ -52,6 +52,6 @@ error:
 	movl r0, _errno
 	mnegl $1, r0
 	jmp (r2)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/fork.S b/sysdeps/unix/fork.S
index 0a71520ac8..8717d513be 100644
--- a/sysdeps/unix/fork.S
+++ b/sysdeps/unix/fork.S
@@ -29,6 +29,6 @@ SYSCALL__ (fork, 0)
 	andl r1, r0
 	ret
 PSEUDO_END (__fork)
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/i386/fork.S b/sysdeps/unix/i386/fork.S
index a33a0b9d9a..b729d47f70 100644
--- a/sysdeps/unix/i386/fork.S
+++ b/sysdeps/unix/i386/fork.S
@@ -27,6 +27,6 @@ SYSCALL__ (fork, 0)
 	andl r1, r0
 	ret
 PSEUDO_END (__fork)
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/inet/syscalls.list b/sysdeps/unix/inet/syscalls.list
index f0b7af7b1a..b8b8554ea6 100644
--- a/sysdeps/unix/inet/syscalls.list
+++ b/sysdeps/unix/inet/syscalls.list
@@ -1,6 +1,6 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-accept		-	accept		Ci:iBN	__libc_accept	accept
+accept		-	accept		Ci:iBN	__libc_accept	accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect __connect_internal connect
 gethostid	-	gethostid	i:	gethostid
@@ -21,7 +21,3 @@ setsockopt	-	setsockopt	i:iiibn	setsockopt	__setsockopt
 shutdown	-	shutdown	i:ii	shutdown
 socket		-	socket		i:iii	__socket	socket
 socketpair	-	socketpair	i:iiif	socketpair
-
-
-
-
diff --git a/sysdeps/unix/mips/fork.S b/sysdeps/unix/mips/fork.S
index dcec965671..1850c17f11 100644
--- a/sysdeps/unix/mips/fork.S
+++ b/sysdeps/unix/mips/fork.S
@@ -27,6 +27,6 @@ SYSCALL__ (fork, 0)
 parent:
 	ret
 	.end __fork
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/sparc/fork.S b/sysdeps/unix/sparc/fork.S
index 735a9599b7..ae594ec8e8 100644
--- a/sysdeps/unix/sparc/fork.S
+++ b/sysdeps/unix/sparc/fork.S
@@ -26,6 +26,6 @@ SYSCALL__ (fork, 0)
 	sub %o1, 1, %o1
 	retl
 	and %o0, %o1, %o0
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 
 weak_alias (__fork, fork)
diff --git a/sysdeps/unix/sparc/vfork.S b/sysdeps/unix/sparc/vfork.S
index 0eb1080cf8..5d48b090d6 100644
--- a/sysdeps/unix/sparc/vfork.S
+++ b/sysdeps/unix/sparc/vfork.S
@@ -30,6 +30,6 @@ SYSCALL__ (vfork, 0)
 	sub %o1, 1, %o1
 	retl
 	and %o0, %o1, %o0
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index bbd068a33e..96e6cb7ae2 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -24,7 +24,7 @@ getuid		-	getuid		i:	__getuid	getuid
 ioctl		-	ioctl		i:iiI	__ioctl		ioctl
 kill		-	kill		i:ii	__kill		kill
 link		-	link		i:ss	__link		link
-lseek		-	lseek		Ci:iii	__libc_lseek	__lseek lseek
+lseek		-	lseek		Ci:iii	__libc_lseek	__lseek lseek __GI___lseek
 mkdir		-	mkdir		i:si	__mkdir		mkdir
 open		-	open		Ci:siv	__libc_open __open open
 profil		-	profil		i:piii	__profil	profil
diff --git a/sysdeps/unix/sysv/aix/accept.c b/sysdeps/unix/sysv/aix/accept.c
index 0e8f67e15b..73f11499f2 100644
--- a/sysdeps/unix/sysv/aix/accept.c
+++ b/sysdeps/unix/sysv/aix/accept.c
@@ -1,4 +1,4 @@
-/* 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
@@ -27,3 +27,4 @@ accept (int fd, __SOCKADDR_ARG addr, socklen_t *addr_len)
   assert (sizeof (socklen_t) == sizeof (int));
   return naccept (fd, addr.__sockaddr__, addr_len);
 }
+libc_hidden_def (accept)
diff --git a/sysdeps/unix/sysv/aix/lseek.c b/sysdeps/unix/sysv/aix/lseek.c
index 387ebd0de8..d4cbdbe702 100644
--- a/sysdeps/unix/sysv/aix/lseek.c
+++ b/sysdeps/unix/sysv/aix/lseek.c
@@ -7,3 +7,4 @@ __lseek (int fd, off_t offset, int whence)
   return lseek (fd, offset, whence);
 }
 strong_alias (__lseek, __libc_lseek)
+libc_hidden_def (__lseek)
diff --git a/sysdeps/unix/sysv/linux/accept.S b/sysdeps/unix/sysv/linux/accept.S
index 75d57368bc..491ebe2ab2 100644
--- a/sysdeps/unix/sysv/linux/accept.S
+++ b/sysdeps/unix/sysv/linux/accept.S
@@ -3,3 +3,4 @@
 #define	NARGS	3
 #define NEED_CANCELLATION
 #include <socket.S>
+libc_hidden_def (accept)
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 6907ef1d2f..a053468b34 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -36,7 +36,7 @@ sys_ustat	ustat	ustat		2	__syscall_ustat
 sys_mknod	xmknod	mknod		3	__syscall_mknod
 
 # proper socket implementations:
-accept		-	accept		C:3	__libc_accept	__accept accept
+accept		-	accept		C:3	__libc_accept	__accept accept __GI_accept
 bind		-	bind		3	__bind		bind
 connect		-	connect		C:3	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	3	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/arm/vfork.S b/sysdeps/unix/sysv/linux/arm/vfork.S
index 3364c686d6..a2c6bf3407 100644
--- a/sysdeps/unix/sysv/linux/arm/vfork.S
+++ b/sysdeps/unix/sysv/linux/arm/vfork.S
@@ -46,6 +46,6 @@ ENTRY (__vfork)
     	b	PLTJMP(C_SYMBOL_NAME(__syscall_error))
 
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/cris/vfork.S b/sysdeps/unix/sysv/linux/cris/vfork.S
index f471efe0a5..74a8556765 100644
--- a/sysdeps/unix/sysv/linux/cris/vfork.S
+++ b/sysdeps/unix/sysv/linux/cris/vfork.S
@@ -22,6 +22,6 @@ PSEUDO (__vfork, vfork, 0)
 	Ret
 	nop
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
index bc977e2e30..65fc3cba64 100644
--- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
+++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
@@ -14,7 +14,7 @@ semget		-	semget		i:iii	__semget	semget
 semctl		-	semctl		i:iiii	__semctl	semctl
 
 # proper socket implementations:
-accept		-	accept		Ci:iBN	__libc_accept	__accept accept
+accept		-	accept		Ci:iBN	__libc_accept	__accept accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect 
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/i386/vfork.S b/sysdeps/unix/sysv/linux/i386/vfork.S
index a3ff0d4eef..e1f6df0998 100644
--- a/sysdeps/unix/sysv/linux/i386/vfork.S
+++ b/sysdeps/unix/sysv/linux/i386/vfork.S
@@ -73,6 +73,6 @@ ENTRY (__vfork)
 	ret
 #endif
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/ia64/fork.S b/sysdeps/unix/sysv/linux/ia64/fork.S
index 22f67c1ce8..f74e709b3c 100644
--- a/sysdeps/unix/sysv/linux/ia64/fork.S
+++ b/sysdeps/unix/sysv/linux/ia64/fork.S
@@ -38,5 +38,5 @@ ENTRY(__libc_fork)
 PSEUDO_END(__libc_fork)
 
 weak_alias (__libc_fork, __fork)
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 weak_alias (__libc_fork, fork)
diff --git a/sysdeps/unix/sysv/linux/ia64/setjmp.S b/sysdeps/unix/sysv/linux/ia64/setjmp.S
index a9417673ca..954d805f6c 100644
--- a/sysdeps/unix/sysv/linux/ia64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/ia64/setjmp.S
@@ -80,7 +80,7 @@ LEAF(_setjmp)
 	mov in1=0
 	br.cond.sptk.many __sigsetjmp
 END(_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 
 	/* __sigsetjmp(__jmp_buf buf, int savemask) */
 
diff --git a/sysdeps/unix/sysv/linux/ia64/syscalls.list b/sysdeps/unix/sysv/linux/ia64/syscalls.list
index 7df0265feb..1e43c55b3e 100644
--- a/sysdeps/unix/sysv/linux/ia64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/ia64/syscalls.list
@@ -3,7 +3,7 @@
 umount2		-	umount		2	__umount2	umount2
 
 # Whee! 64-bit systems naturally implement llseek.
-llseek		EXTRA	lseek		C:3	__libc_lseek	__lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+llseek		EXTRA	lseek		C:3	__libc_lseek	__lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 __GI___lseek
 lseek		llseek	-
 pread		-	pread		C:4	__libc_pread	__libc_pread64 __pread pread __pread64 pread64
 pwrite		-	pwrite		C:4	__libc_pwrite	__libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
@@ -33,7 +33,7 @@ semget		-	semget		i:iii	__semget	semget
 semctl		-	semctl		i:iiii	__semctl	semctl
 
 # proper socket implementations:
-accept		-	accept		Ci:iBN	__libc_accept	__accept accept
+accept		-	accept		Ci:iBN	__libc_accept	__accept accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/ia64/sysdep.h b/sysdeps/unix/sysv/linux/ia64/sysdep.h
index 0a2c1bdc4b..0189075e1f 100644
--- a/sysdeps/unix/sysv/linux/ia64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/ia64/sysdep.h
@@ -18,6 +18,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
+#ifndef _LINUX_IA64_SYSDEP_H
+#define _LINUX_IA64_SYSDEP_H 1
+
 #include <sysdeps/unix/sysdep.h>
 #include <sysdeps/ia64/sysdep.h>
 
@@ -197,3 +200,5 @@
   "b6", "b7"
 
 #endif /* not __ASSEMBLER__ */
+
+#endif /* linux/ia64/sysdep.h */
diff --git a/sysdeps/unix/sysv/linux/ia64/vfork.S b/sysdeps/unix/sysv/linux/ia64/vfork.S
index 89d216f1b9..cbfaa3177c 100644
--- a/sysdeps/unix/sysv/linux/ia64/vfork.S
+++ b/sysdeps/unix/sysv/linux/ia64/vfork.S
@@ -40,6 +40,6 @@ ENTRY(__vfork)
 (p6)	br.cond.spnt.few __syscall_error
 	ret
 PSEUDO_END(__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/m68k/vfork.S b/sysdeps/unix/sysv/linux/m68k/vfork.S
index 8968caece7..ed5e1e81d5 100644
--- a/sysdeps/unix/sysv/linux/m68k/vfork.S
+++ b/sysdeps/unix/sysv/linux/m68k/vfork.S
@@ -62,6 +62,6 @@ ENTRY (__vfork)
 	rts
 
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/mips/syscalls.list b/sysdeps/unix/sysv/linux/mips/syscalls.list
index ec75228ce1..35666c7a86 100644
--- a/sysdeps/unix/sysv/linux/mips/syscalls.list
+++ b/sysdeps/unix/sysv/linux/mips/syscalls.list
@@ -14,7 +14,7 @@ s_sigsuspend	sigsuspend sigsuspend	i:p	__syscall_sigsuspend
 # Socket functions; Linux/MIPS doesn't use the socketcall(2) wrapper;
 # it's provided for compatibility, though.
 #
-accept		-	accept		Ci:iBN	__libc_accept	__accept accept
+accept		-	accept		Ci:iBN	__libc_accept	__accept accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
index d813d7af51..d7773c2a36 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list
@@ -1,6 +1,6 @@
 # File name	Caller	Syscall name	# args	Strong name	Weak names
 
-llseek		EXTRA	lseek		C:3	__libc_lseek	__lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64
+llseek		EXTRA	lseek		C:3	__libc_lseek	__lseek lseek __libc_lseek64 __llseek llseek __lseek64 lseek64 __GI___lseek
 lseek		llseek	-
 pread		-	pread		C:4	__libc_pread	__libc_pread64 __pread pread __pread64 pread64
 pwrite		-	pwrite		C:4	__libc_pwrite	__libc_pwrite64 __pwrite pwrite __pwrite64 pwrite64
@@ -26,7 +26,7 @@ semget		-	semget		i:iii	__semget	semget
 semctl		-	semctl		i:iiii	__semctl	semctl
 
 # proper socket implementations:
-accept		-	accept		Ci:iBN	__libc_accept	__accept accept
+accept		-	accept		Ci:iBN	__libc_accept	__accept accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/sh/vfork.S b/sysdeps/unix/sysv/linux/sh/vfork.S
index 92426892a3..706aa57b50 100644
--- a/sysdeps/unix/sysv/linux/sh/vfork.S
+++ b/sysdeps/unix/sysv/linux/sh/vfork.S
@@ -109,6 +109,6 @@ ENTRY (__vfork)
 	 nop
 
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/sparc/fork.S b/sysdeps/unix/sysv/linux/sparc/fork.S
index 8d017398e1..2459b8c8ca 100644
--- a/sysdeps/unix/sysv/linux/sparc/fork.S
+++ b/sysdeps/unix/sysv/linux/sparc/fork.S
@@ -26,5 +26,5 @@ PSEUDO (__libc_fork, fork, 0)
 PSEUDO_END (__libc_fork)
 
 weak_alias (__libc_fork, __fork)
-strong_alias (__fork, __GI___fork)
+libc_hidden_def (__fork)
 weak_alias (__libc_fork, fork)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
index df6f81703b..435bf99acb 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/longjmp.S
@@ -46,7 +46,7 @@ END(__libc_siglongjmp)
 
 strong_alias(__libc_siglongjmp, __longjmp)
 strong_alias(__libc_siglongjmp, __libc_longjmp)
-strong_alias(__libc_longjmp, __GI___libc_longjmp)
+libc_hidden_def (__libc_longjmp)
 weak_alias(__libc_siglongjmp, longjmp)
 weak_alias(__libc_siglongjmp, _longjmp)
 weak_alias(__libc_siglongjmp, siglongjmp)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
index ad3d919255..1a9359af5b 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
@@ -34,7 +34,7 @@ ENTRY(_setjmp)
 	ba	__sigsetjmp_local
 	 set	0, %o1
 END(_setjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
 
 /* int setjmp(jmp_buf) */
 
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index a34e49246e..b68148e735 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -16,7 +16,7 @@ sendfile	-	sendfile	i:iipi	sendfile	sendfile64
 
 # Override select.S in parent directory:
 select		-	select		C:5	__select	select
-accept		-	accept		C:3	__libc_accept	__accept accept
+accept		-	accept		C:3	__libc_accept	__accept accept __GI_accept
 bind		-	bind		3	__bind		bind
 connect		-	connect		C:3	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	3	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/sparc/vfork.S b/sysdeps/unix/sysv/linux/sparc/vfork.S
index c5753a363a..eda860e46e 100644
--- a/sysdeps/unix/sysv/linux/sparc/vfork.S
+++ b/sysdeps/unix/sysv/linux/sparc/vfork.S
@@ -25,5 +25,5 @@ PSEUDO (__vfork, vfork, 0)
 	 and	%o0, %o1, %o0
 
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscalls.list b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
index 64abc4fc74..cc7a4a52fa 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/x86_64/syscalls.list
@@ -30,7 +30,7 @@ semctl		-	semctl		i:iiii	__semctl	semctl
 
 
 # proper socket implementations:
-accept		-	accept		Ci:iBN	__libc_accept	__accept accept
+accept		-	accept		Ci:iBN	__libc_accept	__accept accept __GI_accept
 bind		-	bind		i:ipi	__bind		bind
 connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S
index fea24e4d98..4810ba42b5 100644
--- a/sysdeps/unix/sysv/linux/x86_64/vfork.S
+++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S
@@ -46,6 +46,6 @@ ENTRY (__vfork)
 	ret
 
 PSEUDO_END (__vfork)
-strong_alias (__vfork, __GI___vfork)
+libc_hidden_def (__vfork)
 
 weak_alias (__vfork, vfork)
diff --git a/sysdeps/vax/bsd-_setjmp.S b/sysdeps/vax/bsd-_setjmp.S
index 68888d48ed..756e96b707 100644
--- a/sysdeps/vax/bsd-_setjmp.S
+++ b/sysdeps/vax/bsd-_setjmp.S
@@ -30,4 +30,4 @@ ENTRY (_setjmp)
 	pushl r1		/* Push back first argument.  */
 	pushl r0		/* Push back return PC.  */
 	jmp C_SYMBOL_NAME (__sigsetjmp)
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)
diff --git a/sysdeps/x86_64/bsd-_setjmp.S b/sysdeps/x86_64/bsd-_setjmp.S
index f858db5535..478f788275 100644
--- a/sysdeps/x86_64/bsd-_setjmp.S
+++ b/sysdeps/x86_64/bsd-_setjmp.S
@@ -37,4 +37,4 @@ ENTRY (BP_SYM (_setjmp))
 	jmp BP_SYM (__sigsetjmp)
 #endif
 END (BP_SYM (_setjmp))
-strong_alias (_setjmp, __GI__setjmp)
+libc_hidden_def (_setjmp)