From b3b00aa8b0c510db1aec831f47c21e33a6d814be Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Thu, 24 Nov 2016 10:12:37 -0200 Subject: [PATCH] posix: Consolidate Linux sigsuspend implementation This patch consolidates the sigsuspend Linux syscall generation on sysdeps/unix/sysv/linux/sigsuspend.c. It basically removes the alpha assembly version which call the old sigsusped interface using only the first doubleword from sigset. Current minimum supported kernel on alpha (3.2) enforces rt_sigsuspend on the architecture (__ARCH_WANT_SYS_RT_SIGSUSPEND option on kernel), so it is possible to use the default implementation. Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32, arch64-linux-gnu, arm-linux-gnueabihf, powerpc64le-linux-gnu, sparc64-linux-gnu, and sparcv9-linux-gnu. * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Remove file. * sysdeps/unix/sysv/linux/sigsuspend.c: Simplify include list. * nptl/Makefile (CFLAGS-sigsuspend.c): New rule. * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile (CFLAGS-sigsuspend.c): Remove rule. --- ChangeLog | 6 +++++ nptl/Makefile | 1 + sysdeps/unix/sysv/linux/alpha/sigsuspend.S | 32 -------------------------- sysdeps/unix/sysv/linux/sigsuspend.c | 4 ---- sysdeps/unix/sysv/linux/sparc/sparc64/Makefile | 4 ---- 5 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/alpha/sigsuspend.S diff --git a/ChangeLog b/ChangeLog index 0c30af6..92e1c10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2017-05-18 Adhemerval Zanella + * sysdeps/unix/sysv/linux/alpha/sigsuspend.S: Remove file. + * sysdeps/unix/sysv/linux/sigsuspend.c: Simplify include list. + * nptl/Makefile (CFLAGS-sigsuspend.c): New rule. + * sysdeps/unix/sysv/linux/sparc/sparc64/Makefile + (CFLAGS-sigsuspend.c): Remove rule. + * sysdeps/unix/sysv/linux/Makefile (sysdeps_routines): Add tee. (CFLAGS-tee.c): New rule. * sysdeps/unix/sysv/linux/syscalls.list: Remove tee from diff --git a/nptl/Makefile b/nptl/Makefile index cdf69bd..57eab33 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -217,6 +217,7 @@ CFLAGS-close.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-read.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-write.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-nanosleep.c = -fexceptions -fasynchronous-unwind-tables +CFLAGS-sigsuspend.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-pt-system.c = -fexceptions diff --git a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S b/sysdeps/unix/sysv/linux/alpha/sigsuspend.S deleted file mode 100644 index c226be1..0000000 --- a/sysdeps/unix/sysv/linux/alpha/sigsuspend.S +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 1993-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by David Mosberger , 1995. - - 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 - . */ - -/* sigsuspend is a special syscall since it needs to dereference the - sigset. This will have to change when we have more than 64 signals. */ - -#include - -#undef PSEUDO_PREPARE_ARGS -#define PSEUDO_PREPARE_ARGS ldq a0, 0(a0); - -PSEUDO(__sigsuspend, sigsuspend, 1) - ret -PSEUDO_END(__sigsuspend) -libc_hidden_def (__sigsuspend) -weak_alias (__sigsuspend, sigsuspend) -strong_alias (__sigsuspend, __libc_sigsuspend) diff --git a/sysdeps/unix/sysv/linux/sigsuspend.c b/sysdeps/unix/sysv/linux/sigsuspend.c index 8bb0cd4..df29abf 100644 --- a/sysdeps/unix/sysv/linux/sigsuspend.c +++ b/sysdeps/unix/sysv/linux/sigsuspend.c @@ -15,12 +15,8 @@ License along with the GNU C Library; if not, see . */ -#include #include -#include - #include -#include /* Change the set of blocked signals to SET, wait until a signal arrives, and restore the set of blocked signals. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile index 3a7f4aa..715af3d 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile @@ -7,7 +7,3 @@ LD += -melf64_sparc ifeq ($(subdir),stdlib) sysdep_routines += __start_context endif - -ifeq ($(subdir),nptl) -CFLAGS-sigsuspend.c += -fexceptions -endif -- 2.7.4