Add NPTL and five-argument clone support.

diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S
index 043f592..8b8e007 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/clone.S
+++ b/sysdeps/unix/sysv/linux/mips/clone.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2000, 2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ralf Baechle <ralf@linux-mips.org>, 1996.
 
@@ -24,11 +24,23 @@
 #include <sysdep.h>
 #define _ERRNO_H       1
 #include <bits/errno.h>
+#ifdef RESET_PID
+#include <tls.h>
+#endif
+
+#define CLONE_VM      0x00000100
+#define CLONE_THREAD  0x00010000
 
-/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */
+/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
+            void *parent_tidptr, void *tls, void *child_tidptr) */
 
        .text
-LOCALSZ= 1
+#if _MIPS_SIM == _ABIO32
+# define EXTRA_LOCALS 1
+#else
+# define EXTRA_LOCALS 0
+#endif
+LOCALSZ= 4
 FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK
 GPOFF= FRAMESZ-(1*SZREG)
 NESTED(__clone,4*SZREG,sp)
@@ -56,10 +68,26 @@ NESTED(__clone,4*SZREG,sp)
        PTR_SUBU        a1,32           /* Reserve argument save space.  */
        PTR_S           a0,0(a1)        /* Save function pointer.  */
        PTR_S           a3,PTRSIZE(a1)  /* Save argument pointer.  */
+#ifdef RESET_PID
+       LONG_S          a2,(PTRSIZE*2)(a1)      /* Save clone flags.  */
+#endif
 
+       move            a0,a2
+
+       /* Shuffle in the last three arguments - arguments 5, 6, and 7 to
+          this function, but arguments 3, 4, and 5 to the syscall.  */
+#if _MIPS_SIM == _ABIO32
+       PTR_L           a2,(FRAMESZ+PTRSIZE+PTRSIZE+16)(sp)
+       PTR_S           a2,16(sp)
+       PTR_L           a2,(FRAMESZ+16)(sp)
+       PTR_L           a3,(FRAMESZ+PTRSIZE+16)(sp)
+#else
+       move            a2,a4
+       move            a3,a5
+       move            a4,a6
+#endif
 
        /* Do the system call */
-       move            a0,a2
        li              v0,__NR_clone
        syscall
 
@@ -94,6 +122,15 @@ L(thread_start):
        /* cp is already loaded.  */
        SAVE_GP (GPOFF)
        /* The stackframe has been created on entry of clone().  */
+
+#ifdef RESET_PID
+       /* Check and see if we need to reset the PID.  */
+       LONG_L          a0,(PTRSIZE*2)(sp)
+       and             a1,a0,CLONE_THREAD
+       beqz            a1,L(restore_pid)
+L(donepid):
+#endif
+
        /* Restore the arg for user's function.  */
        PTR_L           t9,0(sp)        /* Function pointer.  */
        PTR_L           a0,PTRSIZE(sp)  /* Argument pointer.  */
@@ -109,6 +146,21 @@ L(thread_start):
 #else
        jal             _exit
 #endif
+
+#ifdef RESET_PID
+L(restore_pid):
+       and             a1,a0,CLONE_VM
+       li              v0,-1
+       bnez            a1,L(gotpid)
+       li              v0,__NR_getpid
+       syscall
+L(gotpid):
+       READ_THREAD_POINTER(v1)
+       INT_S           v0,PID_OFFSET(v1)
+       INT_S           v0,TID_OFFSET(v1)
+       b               L(donepid)
+#endif
+
        END(__thread_start)
 
 weak_alias(__clone, clone)