This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.19-426-gdef4bcb
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 16 May 2014 18:25:36 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.19-426-gdef4bcb
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, master has been updated
via def4bcb29ddc15d9c446264f867c72e293f0efcd (commit)
from d51d659d114e2edb0037b2af45d6ee36458e48d1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=def4bcb29ddc15d9c446264f867c72e293f0efcd
commit def4bcb29ddc15d9c446264f867c72e293f0efcd
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri May 16 11:17:41 2014 -0700
Split arch-fork.h from fork.h
diff --git a/ChangeLog b/ChangeLog
index 4d286eb..0fd2758 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2014-05-16 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/unix/sysv/linux/i386/fork.h: Moved ...
+ * sysdeps/unix/sysv/linux/i386/arch-fork.h: ... here.
+ Don't do #include_next.
+ * sysdeps/unix/sysv/linux/x86_64/fork.h: Moved ...
+ * sysdeps/unix/sysv/linux/x86_64/arch-fork.h: ... here.
+ Don't do #include_next.
+ * sysdeps/unix/sysv/linux/mips/arch-fork.h: New file.
+ * sysdeps/unix/sysv/linux/mips/fork.h: File removed.
+ * sysdeps/unix/sysv/linux/powerpc/arch-fork.h: New file.
+ * sysdeps/unix/sysv/linux/powerpc/fork.h: File removed.
+
2014-05-16 Allan McRae <allan@archlinux.org>
* po/sv.po: Update Swedish translation from translation project.
diff --git a/nptl/sysdeps/unix/sysv/linux/fork.c b/nptl/sysdeps/unix/sysv/linux/fork.c
index 722ffce..70201a2 100644
--- a/nptl/sysdeps/unix/sysv/linux/fork.c
+++ b/nptl/sysdeps/unix/sysv/linux/fork.c
@@ -29,6 +29,7 @@
#include <atomic.h>
#include <pthreadP.h>
#include <fork.h>
+#include <arch-fork.h>
unsigned long int *__fork_generation_pointer;
diff --git a/sysdeps/unix/sysv/linux/i386/fork.h b/sysdeps/unix/sysv/linux/i386/arch-fork.h
similarity index 96%
rename from sysdeps/unix/sysv/linux/i386/fork.h
rename to sysdeps/unix/sysv/linux/i386/arch-fork.h
index 2919ccf..70f1b19 100644
--- a/sysdeps/unix/sysv/linux/i386/fork.h
+++ b/sysdeps/unix/sysv/linux/i386/arch-fork.h
@@ -18,10 +18,10 @@
<http://www.gnu.org/licenses/>. */
#include <sched.h>
+#include <sysdep.h>
+#include <tls.h>
#define ARCH_FORK() \
INLINE_SYSCALL (clone, 5, \
CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \
NULL, NULL, &THREAD_SELF->tid)
-
-#include_next <fork.h>
diff --git a/sysdeps/unix/sysv/linux/mips/arch-fork.h b/sysdeps/unix/sysv/linux/mips/arch-fork.h
new file mode 100644
index 0000000..5f94537
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/mips/arch-fork.h
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/arch-fork.h>
diff --git a/sysdeps/unix/sysv/linux/mips/fork.h b/sysdeps/unix/sysv/linux/mips/fork.h
deleted file mode 100644
index 14b238a..0000000
--- a/sysdeps/unix/sysv/linux/mips/fork.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fork.h>
diff --git a/sysdeps/unix/sysv/linux/powerpc/arch-fork.h b/sysdeps/unix/sysv/linux/powerpc/arch-fork.h
new file mode 100644
index 0000000..5f94537
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/arch-fork.h
@@ -0,0 +1 @@
+#include <sysdeps/unix/sysv/linux/i386/arch-fork.h>
diff --git a/sysdeps/unix/sysv/linux/powerpc/fork.h b/sysdeps/unix/sysv/linux/powerpc/fork.h
deleted file mode 100644
index 14b238a..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/fork.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/fork.h>
diff --git a/sysdeps/unix/sysv/linux/x86_64/fork.h b/sysdeps/unix/sysv/linux/x86_64/arch-fork.h
similarity index 96%
rename from sysdeps/unix/sysv/linux/x86_64/fork.h
rename to sysdeps/unix/sysv/linux/x86_64/arch-fork.h
index 1bd5301..97b866b 100644
--- a/sysdeps/unix/sysv/linux/x86_64/fork.h
+++ b/sysdeps/unix/sysv/linux/x86_64/arch-fork.h
@@ -18,10 +18,10 @@
<http://www.gnu.org/licenses/>. */
#include <sched.h>
+#include <sysdep.h>
+#include <tls.h>
#define ARCH_FORK() \
INLINE_SYSCALL (clone, 4, \
CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD, 0, \
NULL, &THREAD_SELF->tid)
-
-#include_next <fork.h>
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++++
nptl/sysdeps/unix/sysv/linux/fork.c | 1 +
sysdeps/unix/sysv/linux/i386/arch-fork.h | 27 +++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/i386/fork.h | 27 ---------------------------
sysdeps/unix/sysv/linux/mips/arch-fork.h | 1 +
sysdeps/unix/sysv/linux/mips/fork.h | 1 -
sysdeps/unix/sysv/linux/powerpc/arch-fork.h | 1 +
sysdeps/unix/sysv/linux/powerpc/fork.h | 1 -
sysdeps/unix/sysv/linux/x86_64/arch-fork.h | 27 +++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/x86_64/fork.h | 27 ---------------------------
10 files changed, 70 insertions(+), 56 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/i386/arch-fork.h
delete mode 100644 sysdeps/unix/sysv/linux/i386/fork.h
create mode 100644 sysdeps/unix/sysv/linux/mips/arch-fork.h
delete mode 100644 sysdeps/unix/sysv/linux/mips/fork.h
create mode 100644 sysdeps/unix/sysv/linux/powerpc/arch-fork.h
delete mode 100644 sysdeps/unix/sysv/linux/powerpc/fork.h
create mode 100644 sysdeps/unix/sysv/linux/x86_64/arch-fork.h
delete mode 100644 sysdeps/unix/sysv/linux/x86_64/fork.h
hooks/post-receive
--
GNU C Library master sources