3 files changed, 4 insertions, 59 deletions
diff --git a/libc/sysdeps/linux/e1/setjmp.c b/libc/sysdeps/linux/e1/setjmp.c
index 502e89b22..750c4e08e 100644
--- a/libc/sysdeps/linux/e1/setjmp.c
+++ b/libc/sysdeps/linux/e1/setjmp.c
@@ -7,6 +7,8 @@
 #include <stdio.h>
 #include <signal.h>
 
+libc_hidden_proto(sigprocmask)
+
 int setjmp( jmp_buf state)
 {
 	asm volatile(	"mov %0, G3\n\t"           
@@ -32,7 +34,7 @@ int sigsetjmp( sigjmp_buf state , int savesigs)
 	if(savesigs) {
 		state->__mask_was_saved = 1;
 		/* how arg in <sigprocmask> is not significant */
-		__sigprocmask(SIG_SETMASK, NULL, &state->__saved_mask);
+		sigprocmask(SIG_SETMASK, NULL, &state->__saved_mask);
 	} else
 		state->__mask_was_saved = 0;
 
diff --git a/libc/sysdeps/linux/microblaze/__longjmp.S b/libc/sysdeps/linux/microblaze/__longjmp.S
index e87a6f6a3..fba1e9fbf 100644
--- a/libc/sysdeps/linux/microblaze/__longjmp.S
+++ b/libc/sysdeps/linux/microblaze/__longjmp.S
@@ -42,6 +42,4 @@ C_ENTRY(__longjmp):
 	nop
 
 C_END(__longjmp)
-
-.weak C_SYMBOL_NAME(__sigprocmask)
-C_SYMBOL_NAME(__sigprocmask) = C_SYMBOL_NAME(sigprocmask)
+libc_hidden_def(__longjmp)
diff --git a/libc/sysdeps/linux/microblaze/longjmp.S b/libc/sysdeps/linux/microblaze/longjmp.S
deleted file mode 100644
index 1d0b9b2b6..000000000
--- a/libc/sysdeps/linux/microblaze/longjmp.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * libc/sysdeps/linux/microblaze/longjmp.S -- `longjmp' for microblaze
- *
- *  Copyright (C) 2003  John Williams <jwilliams@itee.uq.edu.au>
- *  Copyright (C) 2001  NEC Corporation
- *  Copyright (C) 2001  Miles Bader <miles@gnu.org>
- *
- * This file is subject to the terms and conditions of the GNU Lesser
- * General Public License.  See the file COPYING.LIB in the main
- * directory of this archive for more details.
- * 
- * Written by Miles Bader <miles@gnu.org>
- */
-
-#define _SETJMP_H
-#define _ASM
-#include <bits/setjmp.h>
-
-#include <clinkage.h>
-
-	.text
-C_ENTRY(__longjmp):
-	/* load registers from memory to r5 (arg0)*/
-	lwi	r1, r5, 0
-	lwi	r15, r5, 4
-	lwi	r18, r5, 8
-	lwi	r19, r5, 12
-	lwi	r20, r5, 16
-	lwi	r21, r5, 20 
-	lwi	r22, r5, 24 
-	lwi	r23, r5, 28
-	lwi	r24, r5, 32 
-	lwi	r25, r5, 36
-	lwi	r26, r5, 40
-	lwi	r27, r5, 44
-	lwi	r28, r5, 48
-	lwi	r29, r5, 52
-	lwi	r30, r5, 56
-	
-	addi	r3, r0, 1		// return val
-	rtsd	r15, 8			// normal return
-	nop
-
-C_END(__longjmp)
-
-.weak C_SYMBOL_NAME(longjmp)
-C_SYMBOL_NAME(longjmp) = C_SYMBOL_NAME(__longjmp)
-
-.weak C_SYMBOL_NAME(siglongjmp)
-C_SYMBOL_NAME(siglongjmp) = C_SYMBOL_NAME(__longjmp)
-
-.weak C_SYMBOL_NAME(__sigprocmask)
-C_SYMBOL_NAME(__sigprocmask) = C_SYMBOL_NAME(sigprocmask)
-
-libc_hidden_def(__longjmp)