about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/hppa/clone.S
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2014-09-07 16:18:06 -0400
committerCarlos O'Donell <carlos@systemhalted.org>2014-09-07 22:08:36 -0400
commitd83f0734e1522a5e5ea2494565f4dcd25a86d6a0 (patch)
tree9bda9b95797d592780251903ec6a5a5917a63f6e /sysdeps/unix/sysv/linux/hppa/clone.S
parent21c83793a223666b8cfe438d81615941896b355c (diff)
downloadglibc-d83f0734e1522a5e5ea2494565f4dcd25a86d6a0.tar.gz
glibc-d83f0734e1522a5e5ea2494565f4dcd25a86d6a0.tar.xz
glibc-d83f0734e1522a5e5ea2494565f4dcd25a86d6a0.zip
HPPA: Transition to new non-addon NPTL.
Merge roland/nptl-hppa to master, update and test for hppa-linux-gnu.

This commit squashes and commits the work done by Roland McGrath on
roland/nptl-hppa to migrate hppa to the new non-addon NPTL. Some
additional tweaks were required for tcb-offsets.sym to work correctly
along with clone.S (unique to hppa).
Diffstat (limited to 'sysdeps/unix/sysv/linux/hppa/clone.S')
-rw-r--r--sysdeps/unix/sysv/linux/hppa/clone.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 1a3c6c800d..ac8c468d65 100644
--- a/sysdeps/unix/sysv/linux/hppa/clone.S
+++ b/sysdeps/unix/sysv/linux/hppa/clone.S
@@ -24,6 +24,7 @@
 #include <sysdep.h>
 #define _ERRNO_H	1
 #include <bits/errno.h>
+#include <tcb-offsets.h>
 
 /* Non-thread code calls __clone with the following parameters:
    int clone(int (*fn)(void *arg),
@@ -131,7 +132,6 @@ ENTRY(__clone)
 	ldwm	-64(%sp), %r4
 
 .LthreadStart:
-#ifdef RESET_PID
 # define CLONE_VM_BIT		23	/* 0x00000100  */
 # define CLONE_THREAD_BIT	15	/* 0x00010000  */
 	/* Load original clone flags.
@@ -150,7 +150,6 @@ ENTRY(__clone)
 	stw	%ret0, PID_THREAD_OFFSET(%r26)
 	stw	%ret0, TID_THREAD_OFFSET(%r26)
 1:
-#endif
 	/* Load up the arguments.  */
 	ldw	-60(%sp), %arg0
 	ldw     -64(%sp), %r22