diff options
Diffstat (limited to 'libpthread/linuxthreads/sysdeps/unix/sysv')
3 files changed, 6 insertions, 6 deletions
| diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h index 0bb16e453..220a925e6 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/sysdep-cancel.h @@ -139,7 +139,7 @@  #endif  # ifndef __ASSEMBLER__ -#  if defined FLOATING_STACKS && USE___THREAD && defined __PIC__ +#  if defined FLOATING_STACKS && defined __UCLIBC_HAS_TLS__ && defined __PIC__  #   define SINGLE_THREAD_P \    __builtin_expect (THREAD_GETMEM (THREAD_SELF,				      \  				   p_header.data.multiple_threads) == 0, 1) @@ -155,7 +155,7 @@ extern int __local_multiple_threads  # else  #  if !defined __PIC__  #   define SINGLE_THREAD_P cmpl $0, __local_multiple_threads -#  elif defined FLOATING_STACKS && USE___THREAD +#  elif defined FLOATING_STACKS && defined __UCLIBC_HAS_TLS__  #   define SINGLE_THREAD_P cmpl $0, %gs:MULTIPLE_THREADS_OFFSET  #  else  #   if !defined NOT_IN_libc || defined IS_IN_libpthread @@ -165,7 +165,7 @@ extern int __local_multiple_threads    movl __local_multiple_threads@GOT(%ecx), %ecx;\    cmpl $0, (%ecx)  #   endif -#   if !defined HAVE_HIDDEN || !USE___THREAD +#   if !defined HAVE_HIDDEN || !defined __UCLIBC_HAS_TLS__  #    define SINGLE_THREAD_P \    SETUP_PIC_REG (cx);				\    addl $_GLOBAL_OFFSET_TABLE_, %ecx;		\ diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S index fec902752..fb7596f27 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/i386/vfork.S @@ -32,7 +32,7 @@ ENTRY (__vfork)  #ifdef __NR_vfork  # ifdef SHARED -#  if !defined HAVE_HIDDEN || !USE___THREAD +#  if !defined HAVE_HIDDEN || !defined __UCLIBC_HAS_TLS__  	SETUP_PIC_REG (cx)  #  else  	call	__i686.get_pc_thunk.cx diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h index 48b2caadd..224c0e4d8 100644 --- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h +++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/sh/sysdep-cancel.h @@ -155,7 +155,7 @@  # endif  # ifndef __ASSEMBLER__ -#  if defined FLOATING_STACKS && USE___THREAD && defined __PIC__ +#  if defined FLOATING_STACKS && defined __UCLIBC_HAS_TLS__ && defined __PIC__  #   define SINGLE_THREAD_P \    __builtin_expect (THREAD_GETMEM (THREAD_SELF, p_multiple_threads) == 0, 1)  #  else @@ -172,7 +172,7 @@ extern int __local_multiple_threads attribute_hidden;  	.align 2; \       1: .long __local_multiple_threads; \       2: -#  elif defined FLOATING_STACKS && USE___THREAD +#  elif defined FLOATING_STACKS && defined __UCLIBC_HAS_TLS__  #   define SINGLE_THREAD_P \  	stc gbr,r0; \  	mov.w 0f,r1; \ | 
