diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | include/libc-internal.h | 4 | ||||
| -rw-r--r-- | include/time.h | 2 | ||||
| -rw-r--r-- | libpthread/nptl/compat/libc-symbols.h | 6 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/dl-tls.c | 1 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c | 1 |
6 files changed, 10 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 40a0c4d03..eb2033cba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -183,6 +183,10 @@ ifneq ($(UCLIBC_HAS_THREADS),y) $(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 -@for i in `find $(PREFIX)$(DEVEL_PREFIX) -type d` ; do \ chmod 755 $$i; chmod 644 $$i/*.h > /dev/null 2>&1; \ done diff --git a/include/libc-internal.h b/include/libc-internal.h index 03f17dd43..742622e13 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -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> diff --git a/include/time.h b/include/time.h index 645042777..22e6c4b58 100644 --- a/include/time.h +++ b/include/time.h @@ -191,9 +191,7 @@ extern double difftime (time_t __time1, time_t __time0) __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; diff --git a/libpthread/nptl/compat/libc-symbols.h b/libpthread/nptl/compat/libc-symbols.h index e281a3046..2cc3316b5 100644 --- a/libpthread/nptl/compat/libc-symbols.h +++ b/libpthread/nptl/compat/libc-symbols.h @@ -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) diff --git a/libpthread/nptl/sysdeps/generic/dl-tls.c b/libpthread/nptl/sysdeps/generic/dl-tls.c index 1ba8d85fe..d5a25d01b 100644 --- a/libpthread/nptl/sysdeps/generic/dl-tls.c +++ b/libpthread/nptl/sysdeps/generic/dl-tls.c @@ -29,6 +29,7 @@ #include <link.h> #include <string.h> #include <unistd.h> +#include <stdio.h> #define _dl_malloc malloc #define _dl_memset memset diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c index 813e5299a..0ddfe70da 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/fork.c @@ -19,6 +19,7 @@ #include <sched.h> #include <signal.h> +#include <stdio.h> #include <sysdep.h> #include <tls.h> |