3 files changed, 11 insertions, 13 deletions
diff --git a/libpthread/nptl/sysdeps/mips/tls.h b/libpthread/nptl/sysdeps/mips/tls.h
index 2737488da..eb78bf5d0 100644
--- a/libpthread/nptl/sysdeps/mips/tls.h
+++ b/libpthread/nptl/sysdeps/mips/tls.h
@@ -20,14 +20,7 @@
 #ifndef _TLS_H
 #define _TLS_H	1
 
-#if 0
-/*
- * MIPS NPTL - defines a total of two symbols used by the glibc
- *             dynamic loader. Hopefully we will not need it for
- *             uClibc.
- */
 #include <dl-sysdep.h>
-#endif
 
 #ifndef __ASSEMBLER__
 # include <stdbool.h>
@@ -89,13 +82,10 @@ typedef union dtv
 # define TLS_DTV_AT_TP	1
 
 /* Get the thread descriptor definition.  */
-#if 0
-/*
- * MIPS NPTL - we have different include paths than glibc.
- */
-# include <nptl/descr.h>
-#else
+#ifdef __UCLIBC__
 # include <descr.h>
+#else
+# include <nptl/descr.h>
 #endif
 
 typedef struct
diff --git a/libpthread/nptl/sysdeps/pthread/pthread.h b/libpthread/nptl/sysdeps/pthread/pthread.h
index 9bc104d31..7157e4718 100644
--- a/libpthread/nptl/sysdeps/pthread/pthread.h
+++ b/libpthread/nptl/sysdeps/pthread/pthread.h
@@ -26,7 +26,11 @@
 #define __need_sigset_t
 #include <signal.h>
 #include <bits/pthreadtypes.h>
+#ifdef __UCLIBC__
 #include <setjmp.h>
+#else
+#include <bits/setjmp.h>
+#endif
 #include <bits/wordsize.h>
 
 
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
index 5b2234f47..d07d04e09 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
@@ -21,4 +21,8 @@
 		   + 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