3 files changed, 18 insertions, 17 deletions
diff --git a/libpthread/nptl/sysdeps/pthread/sigaction.c b/libpthread/nptl/sysdeps/pthread/sigaction.c
index 54b5d2de4..0877e534f 100644
--- a/libpthread/nptl/sysdeps/pthread/sigaction.c
+++ b/libpthread/nptl/sysdeps/pthread/sigaction.c
@@ -20,21 +20,20 @@
 /* This is tricky.  GCC doesn't like #include_next in the primary
    source file and even if it did, the first #include_next is this
    exact file anyway.  */
-#ifndef LIBC_SIGACTION
-
 #include <pthreadP.h>
+#include <features.h>
+#include <errno.h>
+#include <signal.h>
 
+extern __typeof(sigaction) __libc_sigaction;
+extern __typeof(sigaction) __sigaction;
 /* We use the libc implementation but we tell it to not allow
    SIGCANCEL or SIGTIMER to be handled.  */
-# define LIBC_SIGACTION	1
-
-# include <sigaction.c>
-
 int
-sigaction (int sig, const struct sigaction *act, struct sigaction *oact);
-
-int
-__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+__sigaction (sig, act, oact)
+     int sig;
+     const struct sigaction *act;
+     struct sigaction *oact;
 {
   if (__builtin_expect (sig == SIGCANCEL || sig == SIGSETXID, 0))
     {
@@ -47,8 +46,3 @@ __sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
 libc_hidden_proto(sigaction)
 weak_alias (__sigaction, sigaction)
 libc_hidden_weak(sigaction)
-#else
-
-# include_next <sigaction.c>
-
-#endif /* LIBC_SIGACTION */
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
index 8011cc087..b5a21342b 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile.arch
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-libpthread_SSRC = pt-clone.S pt-vfork.S
+libpthread_SSRC = pt-vfork.S
 libpthread_CSRC = pthread_once.c
 
 libc_a_CSRC = fork.c
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep.h b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep.h
index b8c5280ab..01c1a2891 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/sysdep.h
@@ -75,7 +75,7 @@
 #undef INTERNAL_SYSCALL_NCS
 #define INTERNAL_SYSCALL_NCS(number, err, nr, args...) \
 	internal_syscall##nr (= number, , "r" (__v0), err, args)
-
+#undef internal_syscall0
 #define internal_syscall0(ncs_init, cs_init, input, err, dummy...)	\
 ({									\
 	long _sys_result;						\
@@ -97,6 +97,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall1
 #define internal_syscall1(ncs_init, cs_init, input, err, arg1)		\
 ({									\
 	long _sys_result;						\
@@ -119,6 +120,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall2
 #define internal_syscall2(ncs_init, cs_init, input, err, arg1, arg2)	\
 ({									\
 	long _sys_result;						\
@@ -142,6 +144,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall3
 #define internal_syscall3(ncs_init, cs_init, input, err, arg1, arg2, arg3)\
 ({									\
 	long _sys_result;						\
@@ -166,6 +169,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall4
 #define internal_syscall4(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4)\
 ({									\
 	long _sys_result;						\
@@ -196,6 +200,7 @@
    of GCC 3.4.3, this is sufficient.  */
 #define FORCE_FRAME_POINTER alloca (4)
 
+#undef internal_syscall5
 #define internal_syscall5(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5)\
 ({									\
 	long _sys_result;						\
@@ -225,6 +230,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall6
 #define internal_syscall6(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6)\
 ({									\
 	long _sys_result;						\
@@ -255,6 +261,7 @@
 	_sys_result;							\
 })
 
+#undef internal_syscall7
 #define internal_syscall7(ncs_init, cs_init, input, err, arg1, arg2, arg3, arg4, arg5, arg6, arg7)\
 ({									\
 	long _sys_result;						\