This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH roland/nptl-hppa] HPPA: Consolidate NPTL/non versions of clone
- From: Roland McGrath <roland at hack dot frob dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Tue, 27 May 2014 15:33:03 -0700 (PDT)
- Subject: [PATCH roland/nptl-hppa] HPPA: Consolidate NPTL/non versions of clone
- Authentication-results: sourceware.org; auth=none
I haven't tried to compile this or anything. Please verify it results
in no code change.
Thanks,
Roland
* sysdeps/unix/sysv/linux/hppa/clone.S: Include <tcb-offsets.h>.
Deconditionalize the code that was previously under [RESET_PID].
* sysdeps/unix/sysv/linux/hppa/nptl/clone.S: File removed.
--- 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,9 +132,8 @@ ENTRY(__clone)
ldwm -64(%sp), %r4
.LthreadStart:
-#ifdef RESET_PID
-# define CLONE_VM_BIT 23 /* 0x00000100 */
-# define CLONE_THREAD_BIT 15 /* 0x00010000 */
+#define CLONE_VM_BIT 23 /* 0x00000100 */
+#define CLONE_THREAD_BIT 15 /* 0x00010000 */
/* Load original clone flags.
If CLONE_THREAD was passed, don't reset the PID/TID.
If CLONE_VM was passed, we need to store -1 to PID/TID.
@@ -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
--- a/sysdeps/unix/sysv/linux/hppa/nptl/clone.S
+++ /dev/null
@@ -1,3 +0,0 @@
-#define RESET_PID
-#include <tcb-offsets.h>
-#include "../clone.S"