[Glibc-bsd-commits] r4509 - trunk/glibc-ports/kfreebsd/i386/linuxthreads

[Petr Salinger]

Author: ps-guest
Date: 2013-05-30 18:07:23 +0000 (Thu, 30 May 2013)
New Revision: 4509

Modified:
   trunk/glibc-ports/kfreebsd/i386/linuxthreads/sysdep-cancel.h
   trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h
Log:
pthread with only FLOATING_STACKS have been supported ever


Modified: trunk/glibc-ports/kfreebsd/i386/linuxthreads/sysdep-cancel.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/linuxthreads/sysdep-cancel.h	2013-05-30 17:59:46 UTC (rev 4508)
+++ trunk/glibc-ports/kfreebsd/i386/linuxthreads/sysdep-cancel.h	2013-05-30 18:07:23 UTC (rev 4509)
@@ -110,7 +110,7 @@
 #endif
 
 # ifndef __ASSEMBLER__
-#  if defined FLOATING_STACKS && defined PIC
+#  if defined PIC
 #   define SINGLE_THREAD_P \
   __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \
 				   p_header.data.multiple_threads) == 0, 1)
@@ -126,27 +126,8 @@
 # else
 #  if !defined PIC
 #   define SINGLE_THREAD_P cmpl $0, __local_multiple_threads
-#  elif defined FLOATING_STACKS
-#   define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
 #  else
-#   if !defined NOT_IN_libc || defined IS_IN_libpthread
-#    define __SINGLE_THREAD_CMP cmpl $0, __local_multiple_threads at GOTOFF(%ecx)
-#   else
-#    define __SINGLE_THREAD_CMP \
-  movl __local_multiple_threads at GOT(%ecx), %ecx;\
-  cmpl $0, (%ecx)
-#   endif
-#   if !defined HAVE_HIDDEN
-#    define SINGLE_THREAD_P \
-  SETUP_PIC_REG (cx);				\
-  addl $_GLOBAL_OFFSET_TABLE_, %ecx;		\
-  __SINGLE_THREAD_CMP
-#   else
-#    define SINGLE_THREAD_P \
-  call __i686.get_pc_thunk.cx;			\
-  addl $_GLOBAL_OFFSET_TABLE_, %ecx;		\
-  __SINGLE_THREAD_CMP
-#   endif
+#   define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET
 #  endif
 # endif
 

Modified: trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h	2013-05-30 17:59:46 UTC (rev 4508)
+++ trunk/glibc-ports/kfreebsd/i386/linuxthreads/tls.h	2013-05-30 18:07:23 UTC (rev 4509)
@@ -23,16 +23,6 @@
 
 #include <linuxthreads/sysdeps/i386/tls.h>
 
-/* We can support TLS only if the floating-stack support is available.
-   To avoid bothering with the TLS support code at all,
-   use configure --without-tls.
-
-   We need USE_TLS to be consistently defined, for ldsodefs.h conditionals.
-   But some of the code below can cause problems in building libpthread
-*/
-
-#if defined FLOATING_STACKS || !defined IS_IN_libpthread
-
 # ifndef __ASSEMBLER__
 
 #undef TLS_INIT_TP
@@ -87,6 +77,4 @@
 
 # endif /* __ASSEMBLER__ */
 
-#endif	/* FLOATING_STACKS || !IS_IN_libpthread */
-
 #endif	/* _FREEBSD_TLS_H */