From def4bcb29ddc15d9c446264f867c72e293f0efcd Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@hack.frob.com>
Date: Fri, 16 May 2014 11:17:41 -0700
Subject: [PATCH] Split arch-fork.h from fork.h

---
 ChangeLog                                              | 13 +++++++++++++
 nptl/sysdeps/unix/sysv/linux/fork.c                    |  1 +
 sysdeps/unix/sysv/linux/i386/{fork.h => arch-fork.h}   |  4 ++--
 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/{fork.h => arch-fork.h} |  4 ++--
 8 files changed, 20 insertions(+), 6 deletions(-)
 rename sysdeps/unix/sysv/linux/i386/{fork.h => arch-fork.h} (96%)
 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
 rename sysdeps/unix/sysv/linux/x86_64/{fork.h => arch-fork.h} (96%)

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>
-- 
2.7.4