Update.

	* sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S: Use
	__sigprocmask not sigprocmask.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S: Likewise.

	* time/mktime.c: Likewise.
	* misc/getpass.c: Likewise.

6 files changed, 17 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ca0ae4d0c..787ded5cdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-04-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S: Use
+	__sigprocmask not sigprocmask.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S: Likewise.
+
 	* include/string.h: Add libc_hidden_builtin_proto for memcmp.
 	* sysdeps/generic/memcmp.c: Add libc_hidden_builtin_def.
 	* sysdeps/i386/memcmp.S: Likewise.
@@ -8,6 +13,8 @@
 	* sysdeps/sparc/sparc64/memcmp.S: Likewise.
 
 	* sysdeps/unix/sysv/linux/sigprocmask.c: Include <string.h>.
+	* time/mktime.c: Likewise.
+	* misc/getpass.c: Likewise.
 
 	* time/difftime.c (__difftime): New renamed.  Make old name alias.
 	Use __difftime in recursive call.
diff --git a/misc/getpass.c b/misc/getpass.c
index 52dab9439a..62e56866a1 100644
--- a/misc/getpass.c
+++ b/misc/getpass.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-1999, 2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992-1999, 2001, 2003, 2004 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
@@ -18,6 +18,7 @@
 
 #include <stdio.h>
 #include <stdio_ext.h>
+#include <string.h>		/* For string function builtin redirect.  */
 #include <termios.h>
 #include <unistd.h>
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
index baade0bfc1..b7a0baa45d 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/getcontext.S
@@ -238,7 +238,7 @@ L(no_vec):
 	stw	r3,_UC_REGS_PTR(r12)
 	addi	r5,r12,_UC_SIGMASK
 	li	r3,SIG_BLOCK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 
 	lwz	r0,_FRAME_LR_SAVE+16(r1)
 	addi	r1,r1,16
@@ -350,7 +350,7 @@ ENTRY(__novec_getcontext)
 	addi	r5,r3,_UC_SIGMASK - _UC_REG_SPACE
 	li	r4,0
 	li	r3,SIG_BLOCK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 
 	lwz	r0,20(r1)
 	addi	r1,r1,16
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
index ea0669d24b..fb9f1dc2ad 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S
@@ -51,7 +51,7 @@ ENTRY(__setcontext)
 	li	r5,0
 	addi	r4,r3,_UC_SIGMASK
 	li	r3,SIG_SETMASK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 	cmpwi	r3,0
 	bne	L(error_exit)
 
@@ -294,7 +294,7 @@ ENTRY(__novec_setcontext)
 	li	r5,0
 	addi	r4,r3,_UC_SIGMASK
 	li	r3,SIG_SETMASK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 	cmpwi	r3,0
 	bne	L(novec_error_exit)
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
index 2acfa3abee..bd6ced4e1a 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/swapcontext.S
@@ -240,7 +240,7 @@ L(no_vec):
 	stw	r3,_UC_REGS_PTR(r12)
 	addi	r5,r12,_UC_SIGMASK
 	li	r3,SIG_SETMASK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 	cmpwi	r3,0
 	bne	L(error_exit)
 
@@ -571,7 +571,7 @@ ENTRY(__novec_swapcontext)
 	addi	r5,r3,_UC_SIGMASK - _UC_REG_SPACE
 	addi	r4,r4,_UC_SIGMASK
 	li	r3,SIG_SETMASK
-	bl	JUMPTARGET(sigprocmask)
+	bl	JUMPTARGET(__sigprocmask)
 	cmpwi	r3,0
 	bne	L(novec_error_exit)
 
diff --git a/time/mktime.c b/time/mktime.c
index c91a84fce8..ea9778c872 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -1,5 +1,5 @@
 /* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993-1999, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1993-1999, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
@@ -37,11 +37,11 @@
 #include <time.h>
 
 #include <limits.h>
+#include <string.h>		/* For string function builtin redirect.  */
 
 #if DEBUG
 # include <stdio.h>
 # include <stdlib.h>
-# include <string.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
 # define mktime my_mktime
 #endif /* DEBUG */