aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sysdep.h19
2 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d4e56e1235..d9e7432974 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2002-09-30 Roland McGrath <roland@redhat.com>
+ * sysdeps/unix/sysv/linux/x86_64/sysdep.h
+ [USE_TLS && HAVE___THREAD] (SYSCALL_ERROR_HANDLER): Use TLS access.
+
* rt/tst-aio7.c (do_test): Don't read from stdin, which could be the
terminal when the test is running in a background job. Instead, make
a pipe and read from its read half while never writing anything to it.
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index 53dbe8143f..5588b4606e 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -78,10 +78,16 @@
#ifndef PIC
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
-#else
-/* Store (- %rax) into errno through the GOT. Note that errno occupies 4 bytes. */
-#ifdef _LIBC_REENTRANT
-#define SYSCALL_ERROR_HANDLER \
+#elif USE_TLS && HAVE___THREAD
+# define SYSCALL_ERROR_HANDLER \
+ movq errno@GOTTPOFF(%rip), %rcx; \
+ xorq %rdx, %rdx; \
+ subq %rax, %rdx; \
+ movl %eax, %fs:0(%rcx)
+#elif defined _LIBC_REENTRANT
+/* Store (- %rax) into errno through the GOT.
+ Note that errno occupies only 4 bytes. */
+# define SYSCALL_ERROR_HANDLER \
0: \
xorq %rdx, %rdx; \
subq %rax, %rdx; \
@@ -96,15 +102,14 @@
/* A quick note: it is assumed that the call to `__errno_location' does
not modify the stack! */
-#else
-#define SYSCALL_ERROR_HANDLER \
+#else /* Not _LIBC_REENTRANT. */
+# define SYSCALL_ERROR_HANDLER \
0:movq errno@GOTPCREL(%RIP), %rcx; \
xorq %rdx, %rdx; \
subq %rax, %rdx; \
movl %edx, (%rcx); \
orq $-1, %rax; \
jmp L(pseudo_end);
-#endif /* _LIBC_REENTRANT */
#endif /* PIC */
/* Linux/x86-64 takes system call arguments in registers: