diff mbox series

[05/13] posix: Consolidate Linux sigsuspend implementation

Message ID 1494611894-9282-5-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show
Series [01/13] posix: Consolidate Linux pause syscall | expand

Commit Message

Adhemerval Zanella May 12, 2017, 5:58 p.m. UTC 
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.
---
 ChangeLog                                  |  3 +++
 sysdeps/unix/sysv/linux/alpha/sigsuspend.S | 32 ------------------------------
 sysdeps/unix/sysv/linux/sigsuspend.c       |  4 ----
 3 files changed, 3 insertions(+), 36 deletions(-)
 delete mode 100644 sysdeps/unix/sysv/linux/alpha/sigsuspend.S

-- 
2.7.4

Comments

Siddhesh Poyarekar May 18, 2017, 7:16 p.m. UTC | #1 
On Friday 12 May 2017 11:28 PM, Adhemerval Zanella wrote:
> 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.


This is fine.

Siddhesh
diff mbox series

Patch

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 <davidm@cs.arizona.edu>, 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
-   <http://www.gnu.org/licenses/>.  */
-
-/* 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 <sysdep-cancel.h>
-
-#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
    <http://www.gnu.org/licenses/>.  */
 
-#include <errno.h>
 #include <signal.h>
-#include <unistd.h>
-
 #include <sysdep-cancel.h>
-#include <sys/syscall.h>
 
 /* Change the set of blocked signals to SET,
    wait until a signal arrives, and restore the set of blocked signals.  */