posix: Consolidate Linux waitpid syscall

This patch consolidates the waitpid Linux syscall generation on
sysdeps/unix/sysv/linux/waitpid.c.  It basically removes it from
architecture auto-generation list and also remove arch specific
implementations.

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.

	* sysdeps/unix/sysv/linux/sh/syscalls.list: Remove waitpid from
	auto-generated list.
	* sysdeps/unix/sysv/linux/m68k/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/i386/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/syscalls.list: Remove file.
	* sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise.
	* sysdeps/unix/sysv/linux/powerpc/syscalls.list: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 135b5a5e87e3a91f0df73ad1e1d9e5e758d968ad..98dad73e7b9fff11de5b8ef545052fae9bf6bf39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2017-05-18  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+       * sysdeps/unix/sysv/linux/sh/syscalls.list: Remove waitid from
+       auto-generated list.
+       * sysdeps/unix/sysv/linux/m68k/syscalls.list: Likewise.
+       * sysdeps/unix/sysv/linux/i386/syscalls.list: Likewise.
+       * sysdeps/unix/sysv/linux/sparc/syscalls.list: Remove file.
+       * sysdeps/unix/sysv/linux/tile/waitpid.S: Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/syscalls.list: Likewise.
+
        * sysdeps/unix/sysv/linux/generic/pause.c: Remove file.
        * sysdeps/unix/sysv/linux/sparc/sparc64/pause.c: Likewise.
        * sysdeps/unix/sysv/linux/sparc/kernel-features.h [__arch64__]

diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index 145393f7802c854b0c516e6864451d0553bf1e39..58020dfae5c886d1dd53691861262f1f1dd3a352 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -18,7 +18,6 @@ setfsuid      -       setfsuid32      Ei:i    setfsuid
 modify_ldt     EXTRA   modify_ldt      i:ipi   __modify_ldt    modify_ldt
 vm86old                EXTRA   vm86old         i:p     __vm86old       vm86@GLIBC_2.0
 vm86           -       vm86            i:ip    __vm86          vm86@@GLIBC_2.3.4
-waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid
 
 prlimit64      EXTRA   prlimit64       i:iipp  prlimit64
 

diff --git a/sysdeps/unix/sysv/linux/m68k/syscalls.list b/sysdeps/unix/sysv/linux/m68k/syscalls.list
index 4260f3e55f0aab85f53fb3e6895e95de7625e361..55a377b841907ceb07e150b060e4304c04c2ffc2 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/syscalls.list
+++ b/sysdeps/unix/sysv/linux/m68k/syscalls.list
@@ -3,7 +3,6 @@
 chown          -       chown32         i:sii   __chown         chown
 lchown         -       lchown32        i:sii   __lchown        lchown
 fchown         -       fchown32        i:iii   __fchown        fchown
-waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid
 
 getegid                -       getegid32       Ei:     __getegid       getegid
 geteuid                -       geteuid32       Ei:     __geteuid       geteuid

diff --git a/sysdeps/unix/sysv/linux/powerpc/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/syscalls.list
deleted file mode 100644 (file)
index 4f821e9..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/syscalls.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# File name    Caller  Syscall name    # args  Strong name     Weak names
-
-waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid

diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list
index 169d40f074174da6a5d30cf7eb45465e9b3fa266..32badd1ee09d0d6ecc9ceac67a7eab0f496fc03d 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sh/syscalls.list
@@ -15,8 +15,6 @@ getgroups     -       getgroups32     i:ip    __getgroups     getgroups
 setfsgid       -       setfsgid32      Ei:i    setfsgid
 setfsuid       -       setfsuid32      Ei:i    setfsuid
 
-waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid
-
 prlimit64      EXTRA   prlimit64       i:iipp  prlimit64
 
 fanotify_mark  EXTRA   fanotify_mark   i:iiiiis        __fanotify_mark fanotify_mark@@GLIBC_2.16

diff --git a/sysdeps/unix/sysv/linux/sparc/syscalls.list b/sysdeps/unix/sysv/linux/sparc/syscalls.list
deleted file mode 100644 (file)
index 4f821e9..0000000
--- a/sysdeps/unix/sysv/linux/sparc/syscalls.list
+++ /dev/null
@@ -1,3 +0,0 @@
-# File name    Caller  Syscall name    # args  Strong name     Weak names
-
-waitpid                -       waitpid         Ci:ipi  __waitpid       waitpid

diff --git a/sysdeps/unix/sysv/linux/tile/waitpid.S b/sysdeps/unix/sysv/linux/tile/waitpid.S
deleted file mode 100644 (file)
index dee1b0c..0000000
--- a/sysdeps/unix/sysv/linux/tile/waitpid.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-extern pid_t __waitpid_nocancel (pid_t, int *, int) attribute_hidden;
-*/
-#if IS_IN (libc) || IS_IN (libpthread) || IS_IN (librt)
-
-/* Call __NR_wait4, providing fourth argument (struct rusage *) as NULL. */
-#define PSEUDO_EXTRA move r3, zero;
-#include <sysdep-cancel.h>
-
-PSEUDO (__waitpid, wait4, 3)
-ret
-PSEUDO_END(__waitpid)
-
-libc_hidden_def (__waitpid)
-weak_alias (__waitpid, waitpid)
-libc_hidden_weak (waitpid)
-
-#endif