Converted to use weak aliases with macros from libc-symbols.h.

69 files changed, 165 insertions, 69 deletions

diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/pipe.S b/sysdeps/unix/bsd/Attic/osf1/alpha/pipe.S
index 6973e96031..6b074eda1a 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/pipe.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -26,3 +26,5 @@ SYSCALL__ (pipe, 1)
 	/* Go out with a clean status.  */
 	mov zero, r0
 	ret
+
+weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/sigblock.S b/sysdeps/unix/bsd/Attic/osf1/alpha/sigblock.S
index eefd641424..c3556a915f 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/sigblock.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/sigblock.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -23,3 +23,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigblock, 1)
 	ret
+
+weak_alias (__sigblock, sigblock)
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/sigpause.S b/sysdeps/unix/bsd/Attic/osf1/alpha/sigpause.S
index 893ee089eb..04b6d45db7 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/sigpause.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/sigpause.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -23,3 +23,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigpause, 1)
 	ret
+
+weak_alias (__sigpause, sigpause)
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/sigsetmask.S b/sysdeps/unix/bsd/Attic/osf1/alpha/sigsetmask.S
index f2536d7aff..fb3a1d19f7 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/sigsetmask.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/sigsetmask.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -23,3 +23,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigsetmask, 1)
 	ret
+
+weak_alias (__sigsetmask, sigsetmask)
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/sigvec.S b/sysdeps/unix/bsd/Attic/osf1/alpha/sigvec.S
index d0d3ae00ed..b04ec6e12e 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/sigvec.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/sigvec.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -23,3 +23,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigvec, 3)
 	ret
+
+weak_alias (__sigvec, sigvec)
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/wait4.S b/sysdeps/unix/bsd/Attic/osf1/alpha/wait4.S
index 0f76c625b6..e4c322341d 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/wait4.S
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/wait4.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__wait4.S>
+#include <sysdeps/unix/bsd/bsd4.4/wait4.S>
diff --git a/sysdeps/unix/bsd/Attic/osf1/alpha/waitpid.c b/sysdeps/unix/bsd/Attic/osf1/alpha/waitpid.c
index 47129a8845..8378982ac7 100644
--- a/sysdeps/unix/bsd/Attic/osf1/alpha/waitpid.c
+++ b/sysdeps/unix/bsd/Attic/osf1/alpha/waitpid.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__waitpid.c>
+#include <sysdeps/unix/bsd/bsd4.4/waitpid.c>
diff --git a/sysdeps/unix/bsd/hp/m68k/wait3.S b/sysdeps/unix/bsd/hp/m68k/wait3.S
index d02f27fe7c..d0e758595a 100644
--- a/sysdeps/unix/bsd/hp/m68k/wait3.S
+++ b/sysdeps/unix/bsd/hp/m68k/wait3.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -35,3 +35,5 @@ ENTRY(__wait3)
 
 .globl	syscall_error
 error:	jmp syscall_error
+
+weak_alias (__wait3, wait3)
diff --git a/sysdeps/unix/bsd/m68k/pipe.S b/sysdeps/unix/bsd/m68k/pipe.S
index 547b4f351b..633d18fe2c 100644
--- a/sysdeps/unix/bsd/m68k/pipe.S
+++ b/sysdeps/unix/bsd/m68k/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1995 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
@@ -28,3 +28,5 @@ SYSCALL__ (pipe, 1)
 #endif
 	clrl d0
 	rts
+
+weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/bsd/m68k/wait.S b/sysdeps/unix/bsd/m68k/wait.S
index 927fa338b0..c7685b72aa 100644
--- a/sysdeps/unix/bsd/m68k/wait.S
+++ b/sysdeps/unix/bsd/m68k/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1995 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,5 @@ SYSCALL__ (wait, 1)
 	movel d1, a0@
 #endif
 1:	rts
+
+weak_alias (__wait, wait)
diff --git a/sysdeps/unix/bsd/sequent/i386/getgroups.S b/sysdeps/unix/bsd/sequent/i386/getgroups.S
index cf25abe043..b68bcbdbaa 100644
--- a/sysdeps/unix/bsd/sequent/i386/getgroups.S
+++ b/sysdeps/unix/bsd/sequent/i386/getgroups.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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,3 +40,5 @@ myerror:
 	addl %esp, $(NGROUPS_MAX * 4) /* Pop the local array.  */
 	jb syscall_error	/* Check for error from the system call.  */
 	ret			/* Return its value.  */
+
+weak_alias (__getgroups, getgroups)
diff --git a/sysdeps/unix/bsd/sequent/i386/sigvec.S b/sysdeps/unix/bsd/sequent/i386/sigvec.S
index a5812c7fee..1bb57c2074 100644
--- a/sysdeps/unix/bsd/sequent/i386/sigvec.S
+++ b/sysdeps/unix/bsd/sequent/i386/sigvec.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -41,3 +41,5 @@ ENTRY (__sigvec)
 	DO_CALL (sigvec, 4)	/* Do the system call.  */
 	jb syscall_error	/* Check for error.  */
 	ret
+
+weak_alias (__sigvec, sigvec)
diff --git a/sysdeps/unix/bsd/sony/newsos4/wait.c b/sysdeps/unix/bsd/sony/newsos4/wait.c
index d9ee77b4a3..79d54580fd 100644
--- a/sysdeps/unix/bsd/sony/newsos4/wait.c
+++ b/sysdeps/unix/bsd/sony/newsos4/wait.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__wait.c>
+#include <sysdeps/unix/bsd/bsd4.4/wait.c>
diff --git a/sysdeps/unix/bsd/sony/newsos4/wait3.c b/sysdeps/unix/bsd/sony/newsos4/wait3.c
index ecc11134bb..0b3bdee771 100644
--- a/sysdeps/unix/bsd/sony/newsos4/wait3.c
+++ b/sysdeps/unix/bsd/sony/newsos4/wait3.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__wait3.c>
+#include <sysdeps/unix/bsd/bsd4.4/wait3.c>
diff --git a/sysdeps/unix/bsd/sony/newsos4/wait4.c b/sysdeps/unix/bsd/sony/newsos4/wait4.c
index 9183ce1b53..856c99fd61 100644
--- a/sysdeps/unix/bsd/sony/newsos4/wait4.c
+++ b/sysdeps/unix/bsd/sony/newsos4/wait4.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/sun/sunos4/__wait4.c>
+#include <sysdeps/unix/bsd/sun/sunos4/wait4.c>
diff --git a/sysdeps/unix/bsd/sun/sigreturn.S b/sysdeps/unix/bsd/sun/sigreturn.S
index 9a3b5e6bdf..d0a3f3a56b 100644
--- a/sysdeps/unix/bsd/sun/sigreturn.S
+++ b/sysdeps/unix/bsd/sun/sigreturn.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -24,3 +24,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigreturn, 1)
 	/* Does not return.  */
+
+weak_alias (__sigreturn, sigreturn)
diff --git a/sysdeps/unix/bsd/sun/sigvec.S b/sysdeps/unix/bsd/sun/sigvec.S
index fdf919c7b8..c09397486f 100644
--- a/sysdeps/unix/bsd/sun/sigvec.S
+++ b/sysdeps/unix/bsd/sun/sigvec.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -22,3 +22,5 @@ Cambridge, MA 02139, USA.  */
 
 PSEUDO (__raw_sigvec, sigvec, 3)
 	ret
+
+weak_alias (__sigvec, sigvec)
diff --git a/sysdeps/unix/bsd/sun/sunos3/m68k/wait.S b/sysdeps/unix/bsd/sun/sunos3/m68k/wait.S
index c7f681dff1..f69c4b4431 100644
--- a/sysdeps/unix/bsd/sun/sunos3/m68k/wait.S
+++ b/sysdeps/unix/bsd/sun/sunos3/m68k/wait.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/hp/m68k/__wait.S>
+#include <sysdeps/unix/bsd/hp/m68k/wait.S>
diff --git a/sysdeps/unix/bsd/sun/sunos4/setsid.S b/sysdeps/unix/bsd/sun/sunos4/setsid.S
index e0f94b0868..4930c56dcf 100644
--- a/sysdeps/unix/bsd/sun/sunos4/setsid.S
+++ b/sysdeps/unix/bsd/sun/sunos4/setsid.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__setsid.S>
+#include <sysdeps/unix/bsd/bsd4.4/setsid.S>
diff --git a/sysdeps/unix/bsd/sun/sunos4/tcgetattr.c b/sysdeps/unix/bsd/sun/sunos4/tcgetattr.c
index dce1b02ae0..5e45037bb2 100644
--- a/sysdeps/unix/bsd/sun/sunos4/tcgetattr.c
+++ b/sysdeps/unix/bsd/sun/sunos4/tcgetattr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -29,3 +29,5 @@ DEFUN(__tcgetattr, (fd, termios_p),
 {
   return __ioctl (fd, TCGETS, termios_p);
 }
+
+weak_alias (__tcgetattr, tcgetattr)
diff --git a/sysdeps/unix/bsd/sun/sunos4/wait.c b/sysdeps/unix/bsd/sun/sunos4/wait.c
index d9ee77b4a3..79d54580fd 100644
--- a/sysdeps/unix/bsd/sun/sunos4/wait.c
+++ b/sysdeps/unix/bsd/sun/sunos4/wait.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__wait.c>
+#include <sysdeps/unix/bsd/bsd4.4/wait.c>
diff --git a/sysdeps/unix/bsd/sun/sunos4/wait3.c b/sysdeps/unix/bsd/sun/sunos4/wait3.c
index ecc11134bb..0b3bdee771 100644
--- a/sysdeps/unix/bsd/sun/sunos4/wait3.c
+++ b/sysdeps/unix/bsd/sun/sunos4/wait3.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__wait3.c>
+#include <sysdeps/unix/bsd/bsd4.4/wait3.c>
diff --git a/sysdeps/unix/bsd/sun/sunos4/wait4.c b/sysdeps/unix/bsd/sun/sunos4/wait4.c
index 3e9fdcbe63..4d15ddc9e8 100644
--- a/sysdeps/unix/bsd/sun/sunos4/wait4.c
+++ b/sysdeps/unix/bsd/sun/sunos4/wait4.c
@@ -2,7 +2,7 @@
    SunOS 4.1) on top of SunOS's wait4 system call, which has semantics
    different from those documented.  Go Sun!
 
-Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+Copyright (C) 1991, 1992, 1993, 1995 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
@@ -46,3 +46,5 @@ DEFUN(__wait4, (pid, stat_loc, options, usage),
 
   return __wait4_syscall (pid, stat_loc, options, usage);
 }
+
+weak_alias (__wait4, wait4)
diff --git a/sysdeps/unix/bsd/sun/sunos4/waitpid.c b/sysdeps/unix/bsd/sun/sunos4/waitpid.c
index 47129a8845..8378982ac7 100644
--- a/sysdeps/unix/bsd/sun/sunos4/waitpid.c
+++ b/sysdeps/unix/bsd/sun/sunos4/waitpid.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__waitpid.c>
+#include <sysdeps/unix/bsd/bsd4.4/waitpid.c>
diff --git a/sysdeps/unix/bsd/ultrix4/mips/sigvec.S b/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
index fdf919c7b8..20a5dd1c49 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/sigvec.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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/unix/bsd/ultrix4/mips/vfork.S b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
index e194db0c40..37f6d8016d 100644
--- a/sysdeps/unix/bsd/ultrix4/mips/vfork.S
+++ b/sysdeps/unix/bsd/ultrix4/mips/vfork.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -29,3 +29,5 @@ SYSCALL__ (vfork, 0)
 parent:
 	ret
 	nop
+
+weak_alias (__vfork, vfork)
diff --git a/sysdeps/unix/bsd/ultrix4/setsid.S b/sysdeps/unix/bsd/ultrix4/setsid.S
index e0f94b0868..4930c56dcf 100644
--- a/sysdeps/unix/bsd/ultrix4/setsid.S
+++ b/sysdeps/unix/bsd/ultrix4/setsid.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__setsid.S>
+#include <sysdeps/unix/bsd/bsd4.4/setsid.S>
diff --git a/sysdeps/unix/bsd/ultrix4/sysconf.c b/sysdeps/unix/bsd/ultrix4/sysconf.c
index c0b32038bb..a9f3c5bbbe 100644
--- a/sysdeps/unix/bsd/ultrix4/sysconf.c
+++ b/sysdeps/unix/bsd/ultrix4/sysconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor (ian@airs.com).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -58,4 +58,4 @@ DEFUN(__sysconf, (name), int name)
 
 #define __sysconf __default_sysconf
 
-#include <sysdeps/posix/__sysconf.c>
+#include <sysdeps/posix/sysconf.c>
diff --git a/sysdeps/unix/bsd/ultrix4/wait3.S b/sysdeps/unix/bsd/ultrix4/wait3.S
index 102ca18522..83910a5d7b 100644
--- a/sysdeps/unix/bsd/ultrix4/wait3.S
+++ b/sysdeps/unix/bsd/ultrix4/wait3.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (wait3, 3)
 	ret
+
+weak_alias (__wait3, wait3)
diff --git a/sysdeps/unix/bsd/ultrix4/waitpid.S b/sysdeps/unix/bsd/ultrix4/waitpid.S
index 3bc5ce2f5e..b64e528b69 100644
--- a/sysdeps/unix/bsd/ultrix4/waitpid.S
+++ b/sysdeps/unix/bsd/ultrix4/waitpid.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (waitpid, 3)
 	ret
+
+weak_alias (__waitpid, waitpid)
diff --git a/sysdeps/unix/bsd/vax/pipe.S b/sysdeps/unix/bsd/vax/pipe.S
index 9501744c11..10c681aac6 100644
--- a/sysdeps/unix/bsd/vax/pipe.S
+++ b/sysdeps/unix/bsd/vax/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -24,3 +24,5 @@ SYSCALL__ (pipe, 1)
 	movl r1, (r2)
 	clrl r0
 	ret
+
+weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/bsd/vax/wait.S b/sysdeps/unix/bsd/vax/wait.S
index 5316be2026..77311b49bf 100644
--- a/sysdeps/unix/bsd/vax/wait.S
+++ b/sysdeps/unix/bsd/vax/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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
@@ -23,3 +23,5 @@ SYSCALL__ (wait, 1)
 	beq 1f
 	movl r1, (r2)
 1:	ret
+
+weak_alias (__wait, wait)
diff --git a/sysdeps/unix/bsd/vax/wait3.S b/sysdeps/unix/bsd/vax/wait3.S
index 2e7ab13d38..2d8dba8297 100644
--- a/sysdeps/unix/bsd/vax/wait3.S
+++ b/sysdeps/unix/bsd/vax/wait3.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1995 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,5 @@ ENTRY(___wait3)
 
 .globl	syscall_error
 error:	jmp syscall_error
+
+weak_alias (__wait3, wait3)
diff --git a/sysdeps/unix/mips/pipe.S b/sysdeps/unix/mips/pipe.S
index 507a7537f5..f8ce56b118 100644
--- a/sysdeps/unix/mips/pipe.S
+++ b/sysdeps/unix/mips/pipe.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -27,3 +27,5 @@ SYSCALL__ (pipe, 1)
 	j ra
 	move v0, zero
 	nop
+
+weak_alias (__pipe, pipe)
diff --git a/sysdeps/unix/mips/sigreturn.S b/sysdeps/unix/mips/sigreturn.S
index 02e4d2519e..1e76bf5f99 100644
--- a/sysdeps/unix/mips/sigreturn.S
+++ b/sysdeps/unix/mips/sigreturn.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -25,3 +25,5 @@ Cambridge, MA 02139, USA.  */
 ENTRY(__sigreturn)
 	li v0, SYS_sigreturn
 	syscall
+
+weak_alias (__sigreturn, sigreturn)
diff --git a/sysdeps/unix/mips/wait.S b/sysdeps/unix/mips/wait.S
index 2e9a259618..63bce849d4 100644
--- a/sysdeps/unix/mips/wait.S
+++ b/sysdeps/unix/mips/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -40,3 +40,5 @@ noerror:
 	nop
 noarg:
 	ret
+
+weak_alias (__wait, wait)
diff --git a/sysdeps/unix/sysv/i386/sigreturn.S b/sysdeps/unix/sysv/i386/sigreturn.S
index 47905b36fa..be1c6b89bf 100644
--- a/sysdeps/unix/sysv/i386/sigreturn.S
+++ b/sysdeps/unix/sysv/i386/sigreturn.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -23,3 +23,5 @@ ENTRY (__sigreturn)
 	addl $4, %esp		/* Pop the return PC.  */
 	lcall $0xf, $0		/* Do the magic sigreturn trap.  */
 	/* NOTREACHED */
+
+weak_alias (__sigreturn, sigreturn)
diff --git a/sysdeps/unix/sysv/irix4/getgroups.c b/sysdeps/unix/sysv/irix4/getgroups.c
index b85b13942c..714f66077f 100644
--- a/sysdeps/unix/sysv/irix4/getgroups.c
+++ b/sysdeps/unix/sysv/irix4/getgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -29,3 +29,5 @@ DEFUN(__getgroups, (n, groups), size_t n AND gid_t *groups)
 {
   return __syssgi (SGI_GETGROUPS, n, groups);
 }   
+
+weak_alias (__getgroups, getgroups)
diff --git a/sysdeps/unix/sysv/irix4/getrusage.c b/sysdeps/unix/sysv/irix4/getrusage.c
index e160980a7f..fdd3a24042 100644
--- a/sysdeps/unix/sysv/irix4/getrusage.c
+++ b/sysdeps/unix/sysv/irix4/getrusage.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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,5 @@ DEFUN(__getrusage, (who, usage),
 {
   return __syssgi (SGI_RUSAGE, who, usage);
 }
+
+weak_alias (__getrusage, getrusage)
diff --git a/sysdeps/unix/sysv/irix4/gettimeofday.c b/sysdeps/unix/sysv/irix4/gettimeofday.c
index d92b3bb868..8a55f99984 100644
--- a/sysdeps/unix/sysv/irix4/gettimeofday.c
+++ b/sysdeps/unix/sysv/irix4/gettimeofday.c
@@ -1 +1,3 @@
 #include <sysdeps/posix/__gettod.c>
+
+weak_alias (__gettimeofday, gettimeofday)
diff --git a/sysdeps/unix/sysv/irix4/pathconf.c b/sysdeps/unix/sysv/irix4/pathconf.c
index 6e54661f4b..698e30aab7 100644
--- a/sysdeps/unix/sysv/irix4/pathconf.c
+++ b/sysdeps/unix/sysv/irix4/pathconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -30,3 +30,5 @@ DEFUN(__pathconf, (path, name), CONST char *path AND int name)
 {
   return __syssgi (SGI_PATHCONF, PATHCONF, path, name);
 }
+
+weak_alias (__pathconf, pathconf)
diff --git a/sysdeps/unix/sysv/irix4/setpgid.S b/sysdeps/unix/sysv/irix4/setpgid.S
index 2e3135b51c..38ce9cbdcc 100644
--- a/sysdeps/unix/sysv/irix4/setpgid.S
+++ b/sysdeps/unix/sysv/irix4/setpgid.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 PSEUDO (__setpgrp, bsdsetpgrp, 2)
 	ret
+
+weak_alias (__setpgrp, setpgrp)
diff --git a/sysdeps/unix/sysv/irix4/sigreturn.S b/sysdeps/unix/sysv/irix4/sigreturn.S
index 1d624685fd..ebb5c1ae44 100644
--- a/sysdeps/unix/sysv/irix4/sigreturn.S
+++ b/sysdeps/unix/sysv/irix4/sigreturn.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@cs.widener.edu).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -21,3 +21,5 @@ Cambridge, MA 02139, USA.  */
 ENTRY(__sigreturn)
 	li v0, SYS_sigreturn
 	syscall
+
+weak_alias (__sigreturn, sigreturn)
diff --git a/sysdeps/unix/sysv/irix4/sysconf.c b/sysdeps/unix/sysv/irix4/sysconf.c
index 497c6a7828..a310362239 100644
--- a/sysdeps/unix/sysv/irix4/sysconf.c
+++ b/sysdeps/unix/sysv/irix4/sysconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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,5 @@ DEFUN(__sysconf, (name), int name)
 
   return __syssgi (SGI_SYSCONF, name);
 }
+
+weak_alias (__sysconf, sysconf)
diff --git a/sysdeps/unix/sysv/irix4/wait.S b/sysdeps/unix/sysv/irix4/wait.S
index a50a5e6816..9f2afa7997 100644
--- a/sysdeps/unix/sysv/irix4/wait.S
+++ b/sysdeps/unix/sysv/irix4/wait.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@cs.widener.edu).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -38,3 +38,5 @@ noerror:
 	nop
 noarg:
 	ret
+
+weak_alias (__wait, wait)
diff --git a/sysdeps/unix/sysv/irix4/wait3.S b/sysdeps/unix/sysv/irix4/wait3.S
index d4ed738f8c..54065aefdf 100644
--- a/sysdeps/unix/sysv/irix4/wait3.S
+++ b/sysdeps/unix/sysv/irix4/wait3.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/ultrix4/__wait3.S>
+#include <sysdeps/unix/bsd/ultrix4/wait3.S>
diff --git a/sysdeps/unix/sysv/irix4/waitpid.c b/sysdeps/unix/sysv/irix4/waitpid.c
index 47129a8845..8378982ac7 100644
--- a/sysdeps/unix/sysv/irix4/waitpid.c
+++ b/sysdeps/unix/sysv/irix4/waitpid.c
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/bsd4.4/__waitpid.c>
+#include <sysdeps/unix/bsd/bsd4.4/waitpid.c>
diff --git a/sysdeps/unix/sysv/sco3.2.4/getgroups.c b/sysdeps/unix/sysv/sco3.2.4/getgroups.c
index 82e5fbab64..68966bc5df 100644
--- a/sysdeps/unix/sysv/sco3.2.4/getgroups.c
+++ b/sysdeps/unix/sysv/sco3.2.4/getgroups.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -41,3 +41,5 @@ DEFUN(__getgroups, (size, list), int size AND gid_t *list)
 
   return size;
 }
+
+weak_alias (__getgroups, getgroups)
diff --git a/sysdeps/unix/sysv/sco3.2.4/pathconf.S b/sysdeps/unix/sysv/sco3.2.4/pathconf.S
index 2c737620f6..1c4dd9571c 100644
--- a/sysdeps/unix/sysv/sco3.2.4/pathconf.S
+++ b/sysdeps/unix/sysv/sco3.2.4/pathconf.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (pathconf, 2)
 	ret
+
+weak_alias (__pathconf, pathconf)
diff --git a/sysdeps/unix/sysv/sco3.2.4/setpgid.c b/sysdeps/unix/sysv/sco3.2.4/setpgid.c
index 928e6d0120..32f7daf005 100644
--- a/sysdeps/unix/sysv/sco3.2.4/setpgid.c
+++ b/sysdeps/unix/sysv/sco3.2.4/setpgid.c
@@ -1 +1 @@
-#include <sysdeps/unix/sysv/sysv4/__setpgrp.c>
+#include <sysdeps/unix/sysv/sysv4/setpgrp.c>
diff --git a/sysdeps/unix/sysv/sco3.2.4/setsid.c b/sysdeps/unix/sysv/sco3.2.4/setsid.c
index 4a0a706aa5..6337652552 100644
--- a/sysdeps/unix/sysv/sco3.2.4/setsid.c
+++ b/sysdeps/unix/sysv/sco3.2.4/setsid.c
@@ -1 +1 @@
-#include <sysdeps/unix/sysv/sysv4/__setsid.c>
+#include <sysdeps/unix/sysv/sysv4/setsid.c>
diff --git a/sysdeps/unix/sysv/sco3.2.4/sigaction.S b/sysdeps/unix/sysv/sco3.2.4/sigaction.S
index f5453da4cf..dc1bb418d6 100644
--- a/sysdeps/unix/sysv/sco3.2.4/sigaction.S
+++ b/sysdeps/unix/sysv/sco3.2.4/sigaction.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995 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
@@ -25,3 +25,5 @@ ENTRY (__sigaction)
 	DO_CALL (sigaction, 3)
 	jb syscall_error
 	ret
+
+weak_alias (__sigaction, sigaction)
diff --git a/sysdeps/unix/sysv/sco3.2.4/sigprocmask.S b/sysdeps/unix/sysv/sco3.2.4/sigprocmask.S
index 148741ec8c..ff199158a4 100644
--- a/sysdeps/unix/sysv/sco3.2.4/sigprocmask.S
+++ b/sysdeps/unix/sysv/sco3.2.4/sigprocmask.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigprocmask, 3)
 	ret
+
+weak_alias (__sigprocmask, sigprocmask)
diff --git a/sysdeps/unix/sysv/sco3.2.4/sysconf.S b/sysdeps/unix/sysv/sco3.2.4/sysconf.S
index 58e14654d1..631e5e977a 100644
--- a/sysdeps/unix/sysv/sco3.2.4/sysconf.S
+++ b/sysdeps/unix/sysv/sco3.2.4/sysconf.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995 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
@@ -26,3 +26,5 @@ ENTRY (__sysconf)
 	DO_CALL (sysconf, 1)	/* No; use the SCO system call.  */
 	ret
 tzname:	jmp C_SYMBOL_NAME(__tzname_max) /* Yes; bounce to __tzname_max (). */
+
+weak_alias (__sysconf, sysconf)
diff --git a/sysdeps/unix/sysv/sco3.2.4/waitpid.S b/sysdeps/unix/sysv/sco3.2.4/waitpid.S
index 63decf1d9c..523ef37e53 100644
--- a/sysdeps/unix/sysv/sco3.2.4/waitpid.S
+++ b/sysdeps/unix/sysv/sco3.2.4/waitpid.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995 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
@@ -32,3 +32,5 @@ ENTRY (__waitpid)
 	je null
 	movl r1, (scratch)	/* Yes; store the status there.  */
 null:	ret
+
+weak_alias (__waitpid, waitpid)
diff --git a/sysdeps/unix/sysv/sysv4/getdtsz.c b/sysdeps/unix/sysv/sysv4/getdtsz.c
index 9de35d5af6..c1ae6108fb 100644
--- a/sysdeps/unix/sysv/sysv4/getdtsz.c
+++ b/sysdeps/unix/sysv/sysv4/getdtsz.c
@@ -1,2 +1,2 @@
 /* Solaris uses sysconf ala POSIX.1.  */
-#include <sysdeps/posix/__getdtsz.c>
+#include <sysdeps/posix/getdtsz.c>
diff --git a/sysdeps/unix/sysv/sysv4/gethostname.c b/sysdeps/unix/sysv/sysv4/gethostname.c
index c1c9e0a454..cce1149e7f 100644
--- a/sysdeps/unix/sysv/sysv4/gethostname.c
+++ b/sysdeps/unix/sysv/sysv4/gethostname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -29,3 +29,5 @@ DEFUN(__gethostname, (name, namelen), char *name AND size_t namelen)
 {
   return __sysinfo (SI_HOSTNAME, name, namelen);
 }
+
+weak_alias (__gethostname, gethostname)
diff --git a/sysdeps/unix/sysv/sysv4/getpagesize.c b/sysdeps/unix/sysv/sysv4/getpagesize.c
index 241348cbfb..6119640758 100644
--- a/sysdeps/unix/sysv/sysv4/getpagesize.c
+++ b/sysdeps/unix/sysv/sysv4/getpagesize.c
@@ -1,2 +1,2 @@
 /* Solaris uses sysconf ala POSIX.1.  */
-#include <sysdeps/posix/__getpgsz.c>
+#include <sysdeps/posix/getpagesize.c>
diff --git a/sysdeps/unix/sysv/sysv4/i386/lstat.S b/sysdeps/unix/sysv/sysv4/i386/lstat.S
index 0ca214fa47..52ffdbadfd 100644
--- a/sysdeps/unix/sysv/sysv4/i386/lstat.S
+++ b/sysdeps/unix/sysv/sysv4/i386/lstat.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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,5 @@ ENTRY (__lstat)
 	DO_CALL (lxstat, 3)	/* Do the syscall.   */
 	jb syscall_error	/* Check for error.  */
 	ret			/* Return success.  */
+
+weak_alias (__lstat, lstat)
diff --git a/sysdeps/unix/sysv/sysv4/i386/mknod.S b/sysdeps/unix/sysv/sysv4/i386/mknod.S
index 4c879cbefb..21f932c921 100644
--- a/sysdeps/unix/sysv/sysv4/i386/mknod.S
+++ b/sysdeps/unix/sysv/sysv4/i386/mknod.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -32,3 +32,5 @@ ENTRY (__mknod)
         DO_CALL (xmknod, 3)     /* Do the syscall.   */
         jb syscall_error        /* Check for error.  */
         ret                     /* Return success.  */
+
+weak_alias (__mknod, mknod)
diff --git a/sysdeps/unix/sysv/sysv4/i386/stat.S b/sysdeps/unix/sysv/sysv4/i386/stat.S
index 72829332fd..3a5107c267 100644
--- a/sysdeps/unix/sysv/sysv4/i386/stat.S
+++ b/sysdeps/unix/sysv/sysv4/i386/stat.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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,5 @@ ENTRY (__stat)
 	DO_CALL (xstat, 3)	/* Do the syscall.   */
 	jb syscall_error	/* Check for error.  */
 	ret			/* Return success.  */
+
+weak_alias (__stat, stat)
diff --git a/sysdeps/unix/sysv/sysv4/i386/vfork.S b/sysdeps/unix/sysv/sysv4/i386/vfork.S
index 1cdebcded9..bbe99fbc41 100644
--- a/sysdeps/unix/sysv/sysv4/i386/vfork.S
+++ b/sysdeps/unix/sysv/sysv4/i386/vfork.S
@@ -1 +1 @@
-#include <sysdeps/unix/bsd/i386/__vfork.S>
+#include <sysdeps/unix/bsd/i386/vfork.S>
diff --git a/sysdeps/unix/sysv/sysv4/setpgid.c b/sysdeps/unix/sysv/sysv4/setpgid.c
index 90eff3c51c..e71f0db7f0 100644
--- a/sysdeps/unix/sysv/sysv4/setpgid.c
+++ b/sysdeps/unix/sysv/sysv4/setpgid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -30,3 +30,5 @@ DEFUN(__setpgrp, (pid, pgid), int pid AND int pgid)
 {
   return __pgrpsys (1, pid, pgid);
 }
+
+weak_alias (__setpgrp, setpgrp)
diff --git a/sysdeps/unix/sysv/sysv4/setsid.c b/sysdeps/unix/sysv/sysv4/setsid.c
index a32b39ad3b..f0d6c8a4cd 100644
--- a/sysdeps/unix/sysv/sysv4/setsid.c
+++ b/sysdeps/unix/sysv/sysv4/setsid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 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
@@ -30,3 +30,5 @@ DEFUN_VOID(__setsid)
 {
   return __pgrpsys (3);
 }
+
+weak_alias (__setsid, setsid)
diff --git a/sysdeps/unix/sysv/sysv4/sigaction.c b/sysdeps/unix/sysv/sysv4/sigaction.c
index 2644fb03ad..68fd7a1846 100644
--- a/sysdeps/unix/sysv/sysv4/sigaction.c
+++ b/sysdeps/unix/sysv/sysv4/sigaction.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1994, 1995 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
@@ -75,3 +75,5 @@ DEFUN(__sigaction, (sig, act, oact),
 
   return 0;
 }
+
+weak_alias (__sigaction, sigaction)
diff --git a/sysdeps/unix/sysv/sysv4/sigprocmask.S b/sysdeps/unix/sysv/sysv4/sigprocmask.S
index 5da366da82..51fddb0bee 100644
--- a/sysdeps/unix/sysv/sysv4/sigprocmask.S
+++ b/sysdeps/unix/sysv/sysv4/sigprocmask.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,3 +20,5 @@ Cambridge, MA 02139, USA.  */
 
 SYSCALL__ (sigprocmask, 3)
 	ret
+
+weak_alias (__sigprocmask, sigprocmask)
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/utimes.S b/sysdeps/unix/sysv/sysv4/solaris2/utimes.S
index 16baf448b1..54a043c835 100644
--- a/sysdeps/unix/sysv/sysv4/solaris2/utimes.S
+++ b/sysdeps/unix/sysv/sysv4/solaris2/utimes.S
@@ -1,2 +1,2 @@
 /* Solaris has the BSD `utimes' function.  */
-#include <sysdeps/unix/bsd/__utimes.S>
+#include <sysdeps/unix/bsd/utimes.S>
diff --git a/sysdeps/unix/sysv/sysv4/sysconf.c b/sysdeps/unix/sysv/sysv4/sysconf.c
index 71d3d08725..607cd05d14 100644
--- a/sysdeps/unix/sysv/sysv4/sysconf.c
+++ b/sysdeps/unix/sysv/sysv4/sysconf.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -177,3 +177,5 @@ DEFUN(__sysconf, (name), int name)
 #endif
     }
 }
+
+weak_alias (__sysconf, sysconf)
diff --git a/sysdeps/unix/sysv/sysv4/waitpid.c b/sysdeps/unix/sysv/sysv4/waitpid.c
index a0ca8c2f12..f54df4bf6b 100644
--- a/sysdeps/unix/sysv/sysv4/waitpid.c
+++ b/sysdeps/unix/sysv/sysv4/waitpid.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
    Contributed by Brendan Kehoe (brendan@zen.org).
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -116,3 +116,5 @@ DEFUN(__waitpid, (pid, stat_loc, options),
      any PID.  */
   return infop.__pid;
 }
+
+weak_alias (__waitpid, waitpid)