about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-12-27 17:21:56 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-12-30 11:05:28 -0300
commit09153638cfef9166586b0c21e852ea0d6f15a0fd (patch)
tree5f6f18f3831dbf34c44cdd9113bf3b589f5ac0c5
parentd99b500e3da713416ee8bff8f3f9799411c811a2 (diff)
downloadglibc-09153638cfef9166586b0c21e852ea0d6f15a0fd.tar.gz
glibc-09153638cfef9166586b0c21e852ea0d6f15a0fd.tar.xz
glibc-09153638cfef9166586b0c21e852ea0d6f15a0fd.zip
alpha: Set wait4 as cancellation entrypoint
Since both wait and waitpid are implemented on top of wait4.  It fixes
nptl/tst-cancel{x}{4,5,7}.

Checked on alpha-linux-gnu.
-rw-r--r--sysdeps/unix/sysv/linux/alpha/syscalls.list1
-rw-r--r--sysdeps/unix/sysv/linux/alpha/wait4.c26
2 files changed, 26 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list
index 95a27e18e8..caf45ea359 100644
--- a/sysdeps/unix/sysv/linux/alpha/syscalls.list
+++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list
@@ -28,7 +28,6 @@ getitimer	-	getitimer	i:ip	__getitimer	getitimer@@GLIBC_2.1
 setitimer	-	setitimer	i:ipP	__setitimer	setitimer@@GLIBC_2.1
 utimes		-	utimes		i:sp	__utimes	utimes@@GLIBC_2.1
 getrusage	-	getrusage	i:ip	__getrusage	getrusage@@GLIBC_2.1
-wait4		-	wait4		i:iWiP	__wait4		wait4@@GLIBC_2.1
 
 # avoid 64-bit aliases on 32-bit statfs syscalls
 fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs
diff --git a/sysdeps/unix/sysv/linux/alpha/wait4.c b/sysdeps/unix/sysv/linux/alpha/wait4.c
new file mode 100644
index 0000000000..0c86306a5a
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/wait4.c
@@ -0,0 +1,26 @@
+/* wait4 -- wait for process to change state.  Linux/Alpha version.
+   Copyright (C) 2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   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
+   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
+   <http://www.gnu.org/licenses/>.  */
+
+#include <shlib-compat.h>
+
+#undef weak_alias
+#define weak_alias(a, b)
+#include <sysdeps/unix/sysv/linux/wait4.c>
+versioned_symbol (libc, __wait4, wait4, GLIBC_2_1);
+
+/* GLIBC_2_0 version is implemented at osf_wait4.c.  */