* [PATCH] libc x86-64 __thread fix
@ 2002-10-14 12:38 Jakub Jelinek
2002-10-14 14:00 ` Roland McGrath
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-10-14 12:38 UTC (permalink / raw)
To: Roland McGrath, Ulrich Drepper; +Cc: Glibc hackers
Hi!
2002-10-14 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/sysdep.h: Include tls.h.
(SYSCALL_ERROR_HANDLER): Use RTLD_PRIVATE_ERRNO sequence
in ld.so even if __thread is supported.
--- libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h.jj 2002-10-11 08:54:41.000000000 -0400
+++ libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h 2002-10-14 08:16:36.000000000 -0400
@@ -23,6 +23,7 @@
#include <sysdeps/unix/x86_64/sysdep.h>
#include <bp-sym.h>
#include <bp-asm.h>
+#include <tls.h>
#ifdef IS_IN_rtld
# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */
@@ -82,22 +83,22 @@
#ifndef PIC
#define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */
-#elif USE___THREAD
+#elif RTLD_PRIVATE_ERRNO
# define SYSCALL_ERROR_HANDLER \
0: \
- movq errno@GOTTPOFF(%rip), %rcx; \
+ leaq errno(%rip), %rcx; \
xorq %rdx, %rdx; \
subq %rax, %rdx; \
- movl %edx, %fs:(%rcx); \
+ movl %edx, (%rcx); \
orq $-1, %rax; \
jmp L(pseudo_end);
-#elif RTLD_PRIVATE_ERRNO
+#elif USE___THREAD
# define SYSCALL_ERROR_HANDLER \
0: \
- leaq errno(%rip), %rcx; \
+ movq errno@GOTTPOFF(%rip), %rcx; \
xorq %rdx, %rdx; \
subq %rax, %rdx; \
- movl %edx, (%rcx); \
+ movl %edx, %fs:(%rcx); \
orq $-1, %rax; \
jmp L(pseudo_end);
#elif defined _LIBC_REENTRANT
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libc x86-64 __thread fix
2002-10-14 12:38 [PATCH] libc x86-64 __thread fix Jakub Jelinek
@ 2002-10-14 14:00 ` Roland McGrath
2002-10-14 16:13 ` Jakub Jelinek
0 siblings, 1 reply; 4+ messages in thread
From: Roland McGrath @ 2002-10-14 14:00 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Ulrich Drepper, Glibc hackers
Something is wrong if you need that. USE___THREAD != HAVE___THREAD.
Why is USE___THREAD defined in your rtld build?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libc x86-64 __thread fix
2002-10-14 14:00 ` Roland McGrath
@ 2002-10-14 16:13 ` Jakub Jelinek
2002-10-15 0:36 ` Roland McGrath
0 siblings, 1 reply; 4+ messages in thread
From: Jakub Jelinek @ 2002-10-14 16:13 UTC (permalink / raw)
To: Roland McGrath; +Cc: Ulrich Drepper, Glibc hackers
On Mon, Oct 14, 2002 at 12:37:59PM -0700, Roland McGrath wrote:
> Something is wrong if you need that. USE___THREAD != HAVE___THREAD.
> Why is USE___THREAD defined in your rtld build?
Actually, maybe just the #include <tls.h> is needed.
The problem was that without including tls.h uname.os etc. in libc-pic.a
was calling __errno_location(), which caused rtld-errno-loc.os to be
added into librtld.a. But rtld-errno-loc.os would not compile, because
errno was first defined as normal variable in include/errno.h and then
redefined as __thread variable in sysdeps/generic/errno-loc.c.
Though IMHO putting RTLD_PRIVATE_ERRNO case before USE__THREAD
shouldn't hurt.
Jakub
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] libc x86-64 __thread fix
2002-10-14 16:13 ` Jakub Jelinek
@ 2002-10-15 0:36 ` Roland McGrath
0 siblings, 0 replies; 4+ messages in thread
From: Roland McGrath @ 2002-10-15 0:36 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Ulrich Drepper, Glibc hackers
> Actually, maybe just the #include <tls.h> is needed.
Yes, though that doesn't directly affect the build of the rtld modules.
> The problem was that without including tls.h uname.os etc. in libc-pic.a
Ah, I see. I was confused as to how it could be losing even if
USE___THREAD was never defined at all, because !defined -> 0 is the right
default for the rtld build. But that explains it, since it was the libc
build of the module that indirectly loused up the rtld build.
> Though IMHO putting RTLD_PRIVATE_ERRNO case before USE__THREAD
> shouldn't hurt.
Certainly. I just don't like these things to be mysterious.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2002-10-14 23:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-10-14 12:38 [PATCH] libc x86-64 __thread fix Jakub Jelinek
2002-10-14 14:00 ` Roland McGrath
2002-10-14 16:13 ` Jakub Jelinek
2002-10-15 0:36 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).