[uClibc-cvs] svn commit: branches/uClibc-nptl/libpthread/nptl/sysdeps: mips pthread unix/sysv/linux/mips

[sjhill at uclibc.org]

Author: sjhill
Date: 2005-06-02 21:07:52 -0600 (Thu, 02 Jun 2005)
New Revision: 10462

Log:
Fix up include paths for compilation in uClibc.


Modified:
   branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/tls.h
   branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c


Changeset:
Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/tls.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/tls.h	2005-06-03 03:05:50 UTC (rev 10461)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/mips/tls.h	2005-06-03 03:07:52 UTC (rev 10462)
@@ -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 @@
 # 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

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h	2005-06-03 03:05:50 UTC (rev 10461)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/pthread/pthread.h	2005-06-03 03:07:52 UTC (rev 10462)
@@ -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>
 
 

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c	2005-06-03 03:05:50 UTC (rev 10461)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/mips/createthread.c	2005-06-03 03:07:52 UTC (rev 10462)
@@ -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