This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/nptl-hppa created. glibc-2.19-494-g5b33eab
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 May 2014 22:32:24 -0000
- Subject: GNU C Library master sources branch roland/nptl-hppa created. glibc-2.19-494-g5b33eab
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/nptl-hppa has been created
at 5b33eab0e914e5b98700d10075bfe37ea3791fbc (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5b33eab0e914e5b98700d10075bfe37ea3791fbc
commit 5b33eab0e914e5b98700d10075bfe37ea3791fbc
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue May 27 15:31:27 2014 -0700
HPPA: Consolidate NPTL/non versions of clone
diff --git a/ChangeLog b/ChangeLog
index 6d40439..50704e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2014-05-27 Roland McGrath <roland@hack.frob.com>
+ * 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.
+
* sysdeps/unix/sysv/linux/hppa/arch-fork.h: New file.
* sysdeps/unix/sysv/linux/hppa/nptl/fork.c: File removed.
diff --git a/sysdeps/unix/sysv/linux/hppa/clone.S b/sysdeps/unix/sysv/linux/hppa/clone.S
index 1a3c6c8..04f46a3 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,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
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/clone.S b/sysdeps/unix/sysv/linux/hppa/nptl/clone.S
deleted file mode 100644
index 23750b3..0000000
--- 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"
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9b3fa64950ddf6fd562ef5c13f28d6d8c7253d75
commit 9b3fa64950ddf6fd562ef5c13f28d6d8c7253d75
Author: Roland McGrath <roland@hack.frob.com>
Date: Tue May 27 15:29:47 2014 -0700
HPPA: Convert fork.c to arch-fork.h
diff --git a/ChangeLog b/ChangeLog
index 3d11ba1..6d40439 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-05-27 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/unix/sysv/linux/hppa/arch-fork.h: New file.
+ * sysdeps/unix/sysv/linux/hppa/nptl/fork.c: File removed.
+
+2014-05-27 Roland McGrath <roland@hack.frob.com>
+
* sysdeps/unix/sysv/linux/sh/arch-fork.h: New file.
* nptl/sysdeps/unix/sysv/linux/sh/fork.c: File removed.
diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/fork.c b/sysdeps/unix/sysv/linux/hppa/arch-fork.h
similarity index 89%
rename from sysdeps/unix/sysv/linux/hppa/nptl/fork.c
rename to sysdeps/unix/sysv/linux/hppa/arch-fork.h
index 3c21f5a..f4241fa 100644
--- a/sysdeps/unix/sysv/linux/hppa/nptl/fork.c
+++ b/sysdeps/unix/sysv/linux/hppa/arch-fork.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005-2014 Free Software Foundation, Inc.
+/* ARCH_FORK definition for Linux fork implementation. HPPA version.
+ Copyright (C) 2005-2014 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -29,5 +30,3 @@
INLINE_SYSCALL (clone, 5, \
CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, \
NULL, NULL, NULL, &THREAD_SELF->tid)
-
-#include <nptl/sysdeps/unix/sysv/linux/fork.c>
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources