Browse Source

g/c __libc_errno

Signed-off-by: mirabilos <m@mirbsd.org>
Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
mirabilos 4 years ago
parent
commit
dc79afc0fa

+ 0 - 4
include/errno.h

@@ -70,11 +70,7 @@ extern int _dl_errno; /* attribute_hidden */
 #elif defined __UCLIBC_HAS_TLS__
 # if !defined NOT_IN_libc || defined IS_IN_libpthread
 #  undef errno
-#  ifndef NOT_IN_libc
-#   define errno __libc_errno
-#  else
 #   define errno errno             /* For #ifndef errno tests.  */
-#  endif
 extern __thread int errno attribute_tls_model_ie;
 # endif
 #endif

+ 1 - 2
libc/misc/internals/errno.c

@@ -3,8 +3,7 @@
 #undef errno
 
 #ifdef __UCLIBC_HAS_TLS__
-__thread int errno;
-extern __thread int __libc_errno __attribute__ ((alias ("errno"))) attribute_hidden;
+__thread int errno attribute_tls_model_ie;
 #else
 extern int errno;
 int errno = 0;

+ 0 - 4
libc/sysdeps/linux/aarch64/sysdep.h

@@ -114,11 +114,7 @@ END (name)
 
 #if defined _LIBC_REENTRANT
 # if defined USE___THREAD
-#  ifndef NOT_IN_libc
-#   define SYSCALL_ERROR_ERRNO __libc_errno
-#  else
 #   define SYSCALL_ERROR_ERRNO errno
-#  endif
 # endif
 #endif
 

+ 0 - 4
libc/sysdeps/linux/i386/sysdep.h

@@ -189,11 +189,7 @@ __x86.get_pc_thunk.reg:						      \
 # if defined _LIBC_REENTRANT
 
 #  if defined USE___THREAD
-#   ifndef NOT_IN_libc
-#    define SYSCALL_ERROR_ERRNO __libc_errno
-#   else
 #    define SYSCALL_ERROR_ERRNO errno
-#   endif
 #   define SYSCALL_ERROR_HANDLER					      \
 0:SETUP_PIC_REG (cx);							      \
   addl $_GLOBAL_OFFSET_TABLE_, %ecx;					      \

+ 0 - 4
libc/sysdeps/linux/sh/sysdep.h

@@ -134,11 +134,7 @@
 
 #  if defined USE___THREAD
 
-#   ifndef NOT_IN_libc
-#    define SYSCALL_ERROR_ERRNO __libc_errno
-#   else
 #    define SYSCALL_ERROR_ERRNO errno
-#   endif
 #   define SYSCALL_ERROR_HANDLER \
 	neg r0,r1; \
 	mov r12,r2; \

+ 0 - 4
libc/sysdeps/linux/x86_64/sysdep.h

@@ -168,11 +168,7 @@ lose:									      \
 # ifndef __PIC__
 #  define SYSCALL_ERROR_HANDLER	/* Nothing here; code in sysdep.S is used.  */
 # elif USE___THREAD
-#  ifndef NOT_IN_libc
-#   define SYSCALL_ERROR_ERRNO __libc_errno
-#  else
 #   define SYSCALL_ERROR_ERRNO errno
-#  endif
 #  define SYSCALL_ERROR_HANDLER			\
 0:						\
   movq SYSCALL_ERROR_ERRNO@GOTTPOFF(%rip), %rcx;\

+ 0 - 4
libc/sysdeps/linux/xtensa/sysdep.h

@@ -150,11 +150,7 @@
 
 #if defined _LIBC_REENTRANT
 # if defined USE___THREAD
-#  ifndef NOT_IN_libc
-#   define SYSCALL_ERROR_ERRNO __libc_errno
-#  else
 #   define SYSCALL_ERROR_ERRNO errno
-#  endif
 #  define SYSCALL_ERROR_HANDLER						      \
 0:	rur	a4, THREADPTR;						      \
 	movi	a3, SYSCALL_ERROR_ERRNO@TPOFF;				      \