[Glibc-bsd-commits] r4409 - in trunk/glibc-ports/kfreebsd: i386/linuxthreads mips/linuxthreads x86_64/linuxthreads

[Aurelien Jarno]

Author: aurel32
Date: 2013-05-07 21:17:00 +0000 (Tue, 07 May 2013)
New Revision: 4409

Modified:
   trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h
   trunk/glibc-ports/kfreebsd/mips/linuxthreads/tls.h
   trunk/glibc-ports/kfreebsd/x86_64/linuxthreads/tls.h
Log:
Remove code to handle !HAVE_TLS_SUPPORT


Modified: trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h	2013-05-07 21:04:56 UTC (rev 4408)
+++ trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h	2013-05-07 21:17:00 UTC (rev 4409)
@@ -31,8 +31,7 @@
    But some of the code below can cause problems in building libpthread
 */
 
-#if defined HAVE_TLS_SUPPORT \
-    && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
+#if defined FLOATING_STACKS || !defined IS_IN_libpthread
 
 # ifndef __ASSEMBLER__
 
@@ -88,6 +87,6 @@
 
 # endif /* __ASSEMBLER__ */
 
-#endif	/* HAVE_TLS_SUPPORT && (FLOATING_STACKS || !IS_IN_libpthread) */
+#endif	/* FLOATING_STACKS || !IS_IN_libpthread */
 
 #endif	/* _FREEBSD_TLS_H */

Modified: trunk/glibc-ports/kfreebsd/mips/linuxthreads/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/mips/linuxthreads/tls.h	2013-05-07 21:04:56 UTC (rev 4408)
+++ trunk/glibc-ports/kfreebsd/mips/linuxthreads/tls.h	2013-05-07 21:17:00 UTC (rev 4409)
@@ -69,8 +69,7 @@
    To avoid bothering with the TLS support code at all, use configure
    --without-tls.  */
 
-#if defined HAVE_TLS_SUPPORT \
-    && (defined FLOATING_STACKS || !defined IS_IN_libpthread)
+#if defined FLOATING_STACKS || !defined IS_IN_libpthread
 
 /* Signal that TLS support is available.  */
 # define USE_TLS	1
@@ -201,6 +200,6 @@
 
 # endif /* __ASSEMBLER__ */
 
-#endif /* HAVE_TLS_SUPPORT */
+#endif /* FLOATING_STACKS || !IS_IN_libpthread */
 
 #endif	/* tls.h */

Modified: trunk/glibc-ports/kfreebsd/x86_64/linuxthreads/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/linuxthreads/tls.h	2013-05-07 21:04:56 UTC (rev 4408)
+++ trunk/glibc-ports/kfreebsd/x86_64/linuxthreads/tls.h	2013-05-07 21:17:00 UTC (rev 4409)
@@ -23,10 +23,8 @@
 
 #include <linuxthreads/sysdeps/x86_64/tls.h>
 
-#ifdef HAVE_TLS_SUPPORT
+#ifndef __ASSEMBLER__
 
-# ifndef __ASSEMBLER__
-
 #include <sysarch.h>
 #include <sys/syscall.h>
 
@@ -56,7 +54,6 @@
   })
 
 
-# endif	/* HAVE_TLS_SUPPORT */
 #endif /* __ASSEMBLER__ */
 
 #endif	/* tls.h */