Sync with glibc reference tree and changes for uClibc thus far.

3 files changed, 34 insertions, 31 deletions

diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
index 865f74149..084708397 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
@@ -21,7 +21,8 @@ TOPDIR=../../../../../../../
 include $(TOPDIR)Rules.mak
 include ../../../../../Rules.mak
 
-AR_LIBP_ASRC = pt-vfork.S clone.S
+#AR_LIBP_ASRC = pt-vfork.S clone.S
+AR_LIBP_ASRC = pt-vfork.S
 SO_LIBP_ASRC = $(AR_LIBP_ASRC)
 AR_LIBP_CSRC = pthread_once.c
 SO_LIBP_CSRC = $(AR_LIBP_CSRC)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
index d07d04e09..d8a7c5539 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
@@ -21,8 +21,4 @@
 		   + TLS_TCB_OFFSET + TLS_PRE_TCB_SIZE)
 
 /* Get the real implementation.	 */
-#ifdef __UCLIBC__
 #include <sysdeps/pthread/createthread.c>
-#else
-#include <nptl/sysdeps/pthread/createthread.c>
-#endif
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/not-cancel.h b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/not-cancel.h
index f79953d88..9418417b4 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/not-cancel.h
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/not-cancel.h
@@ -1,4 +1,4 @@
-/* Uncancelable versions of cancelable interfaces.  Generic version.
+/* Uncancelable versions of cancelable interfaces.  Linux version.
    Copyright (C) 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2003.
@@ -18,37 +18,43 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-/* By default we have none.  Map the name to the normal functions.  */
+#include <sysdep.h>
+
+/* Uncancelable open.  */
 #define open_not_cancel(name, flags, mode) \
-  __libc_open (name, flags, mode)
-#ifdef __UCLIBC__
-extern int __libc_open(__const char *__file, int __oflag, ...) __THROW;
-#define open_not_cancel_2(name, flags) \
-  __libc_open (name, flags, 0)
-#else
+   INLINE_SYSCALL (open, 3, (const char *) (name), (flags), (mode))
 #define open_not_cancel_2(name, flags) \
-  __libc_open (name, flags)
-#endif
+   INLINE_SYSCALL (open, 2, (const char *) (name), (flags))
+
+/* Uncancelable close.  */
 #define close_not_cancel(fd) \
-  __close (fd)
-#ifdef __UCLIBC__
-#define close_not_cancel_no_status(fd) \
-  (void) close (fd)
-#define read_not_cancel(fd, buf, n) \
-  read (fd, buf, n)
-#define write_not_cancel(fd, buf, n) \
-  write (fd, buf, n)
-#else
+  INLINE_SYSCALL (close, 1, fd)
 #define close_not_cancel_no_status(fd) \
-  (void) __close (fd)
+  (void) ({ INTERNAL_SYSCALL_DECL (err);				      \
+	    INTERNAL_SYSCALL (close, err, 1, (fd)); })
+
+/* Uncancelable read.  */
 #define read_not_cancel(fd, buf, n) \
-  __read (fd, buf, n)
+  INLINE_SYSCALL (read, 3, (fd), (buf), (n))
+
+/* Uncancelable write.  */
 #define write_not_cancel(fd, buf, n) \
-  __write (fd, buf, n)
-#endif
+  INLINE_SYSCALL (write, 3, (fd), (buf), (n))
+
+/* Uncancelable writev.  */
 #define writev_not_cancel_no_status(fd, iov, n) \
-  (void) __writev (fd, iov, n)
+  (void) ({ INTERNAL_SYSCALL_DECL (err);				      \
+	    INTERNAL_SYSCALL (writev, err, 3, (fd), (iov), (n)); })
+
+/* Uncancelable fcntl.  */
 #define fcntl_not_cancel(fd, cmd, val) \
-  __fcntl (fd, cmd, val)
+  __fcntl_nocancel (fd, cmd, val)
+
+/* Uncancelable waitpid.  */
+#ifdef __NR_waitpid
+# define waitpid_not_cancel(pid, stat_loc, options) \
+  INLINE_SYSCALL (waitpid, 3, pid, stat_loc, options)
+#else
 # define waitpid_not_cancel(pid, stat_loc, options) \
-  __waitpid (pid, stat_loc, options)
+  INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL)
+#endif