aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linuxthreads/sysdeps/unix/sysv/linux/x86_64/vfork.S2
-rw-r--r--nptl/ChangeLog4
-rw-r--r--nptl/sysdeps/x86_64/td_ta_map_lwp2thr.c48
3 files changed, 53 insertions, 1 deletions
diff --git a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/vfork.S b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/vfork.S
index 28989eaa14..22e2d86d97 100644
--- a/linuxthreads/sysdeps/unix/sysv/linux/x86_64/vfork.S
+++ b/linuxthreads/sysdeps/unix/sysv/linux/x86_64/vfork.S
@@ -31,7 +31,7 @@ ENTRY (__vfork)
cmpq $0, __libc_pthread_functions(%rip)
#else
.weak __pthread_fork
- movq $__pthread_fork, %eax
+ movq $__pthread_fork, %rax
testq %rax, %rax
#endif
jne HIDDEN_JUMPTARGET (__fork)
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index faf0720c42..fea1c75d08 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,7 @@
+2003-02-07 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/x86_64/td_ta_map_lwp2thr.c: New file.
+
2003-02-06 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-popen1.
diff --git a/nptl/sysdeps/x86_64/td_ta_map_lwp2thr.c b/nptl/sysdeps/x86_64/td_ta_map_lwp2thr.c
new file mode 100644
index 0000000000..1b405549af
--- /dev/null
+++ b/nptl/sysdeps/x86_64/td_ta_map_lwp2thr.c
@@ -0,0 +1,48 @@
+/* Which thread is running on an LWP? x86-64 version.
+ Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@redhat.com>, 1999.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include "thread_dbP.h"
+#include <tls.h>
+#include <sys/reg.h>
+
+
+td_err_e
+td_ta_map_lwp2thr (const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th)
+{
+ LOG ("td_ta_map_lwp2thr");
+
+ /* Test whether the TA parameter is ok. */
+ if (! ta_ok (ta))
+ return TD_BADTA;
+
+ prgregset_t regs;
+ if (ps_lgetregs (ta->ph, lwpid, regs) != PS_OK)
+ return TD_ERR;
+
+ /* Get the thread area for the addressed thread. */
+ if (ps_get_thread_area (ta->ph, lwpid, regs[FS] >> 3, &th->th_unique)
+ != PS_OK)
+ return TD_ERR; /* XXX Other error value? */
+
+ /* Found it. Now complete the `td_thrhandle_t' object. */
+ th->th_ta_p = (td_thragent_t *) ta;
+
+ return TD_OK;
+}