Split arch-fork.h from fork.h

diff --git a/ChangeLog b/ChangeLog
index 4d286ebd0c869037f216af091543761b3ccf26ca..0fd2758a3a7cc5cb96d43211a2c52c6582b210d7 100644 (file)
--- 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 722ffce25080354be1a983c624b8f25be37c336e..70201a294c3ea9440f295486dd51acd875505bcb 100644 (file)
--- 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 2919ccfcb33adc991e33df96b99e59d66ba7bc83..70f1b19472da34becae793d1ab809d6273744592 100644 (file)
--- 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 (file)
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 (file)
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 (file)
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 (file)
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 1bd5301ebd26964c34e7170213c0788e7f343c35..97b866bc2e8e4f9dcca908a0e46fd41850b18568 100644 (file)
--- 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>