summaryrefslogtreecommitdiff
path: root/sysdeps/unix/x86_64
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-10 16:50:28 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-10 16:50:28 -0400
commitd063d164335938d557460bebaa7cfe388157b627 (patch)
tree92ef3f54771c0a28190b76ee45f90d16fd39714f /sysdeps/unix/x86_64
parent3ce1f2959437e952b9db4eaeed2407424f11a4d1 (diff)
downloadglibc-d063d164335938d557460bebaa7cfe388157b627.tar.gz
Remove support for !USE___THREAD
Diffstat (limited to 'sysdeps/unix/x86_64')
-rw-r--r--sysdeps/unix/x86_64/sysdep.S38
1 files changed, 3 insertions, 35 deletions
diff --git a/sysdeps/unix/x86_64/sysdep.S b/sysdeps/unix/x86_64/sysdep.S
index aca81fef2f..908da3c3d5 100644
--- a/sysdeps/unix/x86_64/sysdep.S
+++ b/sysdeps/unix/x86_64/sysdep.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2004, 2005, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -45,43 +45,11 @@ syscall_error:
movl $EAGAIN, %eax /* Yes; translate it to EAGAIN. */
notb:
#endif
-#if USE___THREAD
-# ifdef PIC
+#ifdef PIC
movq C_SYMBOL_NAME(errno@GOTTPOFF)(%rip), %rcx
movl %eax, %fs:0(%rcx)
-# else
- movl %eax, %fs:C_SYMBOL_NAME(errno@TPOFF)
-# endif
-#elif !defined PIC
-# ifndef _LIBC_REENTRANT
- movl %eax, C_SYMBOL_NAME(errno)
-# else
- pushq %rax
- cfi_adjust_cfa_offset(8)
- PUSH_ERRNO_LOCATION_RETURN
- call BP_SYM (__errno_location)
- POP_ERRNO_LOCATION_RETURN
- popq %rcx
- cfi_adjust_cfa_offset(-8)
- movl %ecx, (%rax)
-# endif
#else
-# if RTLD_PRIVATE_ERRNO
- leaq rtld_errno(%rip), %rcx
- movl %eax, (%rcx)
-# elif !defined _LIBC_REENTRANT
- movq C_SYMBOL_NAME(errno)@GOTPCREL(%rip), %rcx
- movl %eax, (%rcx)
-# else
- pushq %rax
- cfi_adjust_cfa_offset(8)
- PUSH_ERRNO_LOCATION_RETURN
- call C_SYMBOL_NAME (BP_SYM (__errno_location)@PLT)
- POP_ERRNO_LOCATION_RETURN
- popq %rcx
- cfi_adjust_cfa_offset(-8)
- movl %ecx, (%rax)
-# endif
+ movl %eax, %fs:C_SYMBOL_NAME(errno@TPOFF)
#endif
movq $-1, %rax
ret