Merge remote-tracking branch 'origin/roland/nptl-alpha'

diff --git a/ChangeLog b/ChangeLog
index c16e823640b072b2b5f9eaa7402cac54eb380057..6223f79fe6ba4c322276a32fbb57f076e71f10de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 
 2014-05-16  Roland McGrath  <roland@hack.frob.com>
 
+       * sysdeps/unix/sysv/linux/alpha/arch-fork.h: New file.
+       * sysdeps/unix/sysv/linux/ia64/nptl/fork.c: File removed.
+
        * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel):
        Use wait4 regardless of [__NR_waitpid].
 

diff --git a/sysdeps/unix/sysv/linux/ia64/nptl/fork.c b/sysdeps/unix/sysv/linux/alpha/arch-fork.h
similarity index 60%
rename from sysdeps/unix/sysv/linux/ia64/nptl/fork.c
rename to sysdeps/unix/sysv/linux/alpha/arch-fork.h
index a6d319a439bfc58da019839937a3c7fb3869e8d1..2c4543d54f1e1639044edf8764b16a58a60a8f86 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/nptl/fork.c
+++ b/sysdeps/unix/sysv/linux/alpha/arch-fork.h
@@ -1,6 +1,6 @@
-/* Copyright (C) 2003-2014 Free Software Foundation, Inc.
+/* ARCH_FORK definition for Linux fork implementation.  Alpha version.
+   Copyright (C) 2003-2014 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -9,11 +9,11 @@
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
+   License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
 #include <sched.h>
@@ -22,9 +22,7 @@
 #include <tls.h>
 
 
-#define ARCH_FORK() \
-  INLINE_SYSCALL (clone2, 6,                                                 \
-                 CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,        \
-                 NULL, 0, NULL, &THREAD_SELF->tid, NULL)
-
-#include <sysdeps/unix/sysv/linux/fork.c>
+#define ARCH_FORK()                                                    \
+  INLINE_SYSCALL (clone, 5,                                            \
+                 CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,  \
+                 NULL, NULL, &THREAD_SELF->tid, NULL)