svn commit: branches/uClibc-nptl: include libpthread/nptl/compat libpthre etc...

sjhill at uclibc.org sjhill at uclibc.org
Thu Jan 5 01:20:24 UTC 2006


Author: sjhill
Date: 2006-01-04 17:20:21 -0800 (Wed, 04 Jan 2006)
New Revision: 13093

Log:
Clean up headers for the install target. Also define 'attribute_tls_model_ie' in 'libc-internal.h' where it belongs. Update includes in a few other miscellaneous files.


Modified:
   branches/uClibc-nptl/Makefile.in
   branches/uClibc-nptl/include/libc-internal.h
   branches/uClibc-nptl/include/time.h
   branches/uClibc-nptl/libpthread/nptl/compat/libc-symbols.h
   branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-tls.c
   branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c


Changeset:
Modified: branches/uClibc-nptl/Makefile.in
===================================================================
--- branches/uClibc-nptl/Makefile.in	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/Makefile.in	2006-01-05 01:20:21 UTC (rev 13093)
@@ -183,6 +183,10 @@
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/semaphore.h
 	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/bits/*thread*.h
 endif
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+	# Remove this as it is only used internally.
+	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/tls.h
+endif
 	- at for i in `find $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \
 	    chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \
 	done

Modified: branches/uClibc-nptl/include/libc-internal.h
===================================================================
--- branches/uClibc-nptl/include/libc-internal.h	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/include/libc-internal.h	2006-01-05 01:20:21 UTC (rev 13093)
@@ -126,6 +126,10 @@
 # define attribute_noreturn
 #endif
 
+#ifdef __UCLIBC_HAS_THREADS_NATIVE__
+# define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
+#endif
+
 /* Pull in things like __attribute_used__ */
 #include <sys/cdefs.h>
 

Modified: branches/uClibc-nptl/include/time.h
===================================================================
--- branches/uClibc-nptl/include/time.h	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/include/time.h	2006-01-05 01:20:21 UTC (rev 13093)
@@ -191,9 +191,7 @@
      __THROW __attribute__ ((__const__));
 #endif /* __UCLIBC_HAS_FLOATS__ */
 
-#ifdef __UCLIBC_HAS_THREADS_NATIVE__
 # define CLOCK_IDFIELD_SIZE	3
-#endif
 
 /* Return the `time_t' representation of TP and normalize TP.  */
 extern time_t mktime (struct tm *__tp) __THROW;

Modified: branches/uClibc-nptl/libpthread/nptl/compat/libc-symbols.h
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/compat/libc-symbols.h	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/libpthread/nptl/compat/libc-symbols.h	2006-01-05 01:20:21 UTC (rev 13093)
@@ -98,12 +98,6 @@
 # define libc_hidden_data_ver(local, name)
 #endif
 
-#ifdef HAVE_TLS_MODEL_ATTRIBUTE
-# define attribute_tls_model_ie __attribute__ ((tls_model ("initial-exec")))
-#else
-# define attribute_tls_model_ie
-#endif
-
 /* Define SET as a symbol set.  This may be required (it is in a.out) to
    be able to use the set's contents.  */
 #  define symbol_set_define(set)	symbol_set_declare(set)

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-tls.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-tls.c	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/generic/dl-tls.c	2006-01-05 01:20:21 UTC (rev 13093)
@@ -29,6 +29,7 @@
 #include <link.h>
 #include <string.h>
 #include <unistd.h>
+#include <stdio.h>
 
 #define	_dl_malloc	malloc
 #define _dl_memset	memset

Modified: branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c
===================================================================
--- branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c	2006-01-05 01:16:47 UTC (rev 13092)
+++ branches/uClibc-nptl/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c	2006-01-05 01:20:21 UTC (rev 13093)
@@ -19,6 +19,7 @@
 
 #include <sched.h>
 #include <signal.h>
+#include <stdio.h>
 #include <sysdep.h>
 #include <tls.h>
 




More information about the uClibc-cvs mailing list