Use struct sigcontext instead of struct sigcontext_struct

* configure.ac (AC_CHECK_TYPES): Remove struct sigcontext_struct.
* signal.c (sys_sigreturn) [S390 || S390X || POWERPC || ALPHA): Replace
struct sigcontext_struct with struct sigcontext.

Reported by John Spencer.

diff --git a/configure.ac b/configure.ac
index a60b25f25c3f28038f26781e6d4d985ec5cb5f89..96e72ca0a1945a97bbb0a69c3e59fed0d74ae5ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -243,8 +243,7 @@ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
 #include <sys/socket.h>
 #include <asm/types.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
-AC_CHECK_TYPES([struct sigcontext_struct,
-               struct sigcontext],,, [#include <signal.h>])
+AC_CHECK_TYPES([struct sigcontext],,, [#include <signal.h>])
 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
 
 AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])

diff --git a/signal.c b/signal.c
index 3411ddd6ca8429bb3c340f94fde80517e64706ef..3a11b8aa1f6bc9120e14a51f7afabd3976893ee3 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -827,7 +827,7 @@ sys_sigreturn(struct tcb *tcp)
 #elif defined(S390) || defined(S390X)
        if (entering(tcp)) {
                long usp;
-               struct sigcontext_struct sc;
+               struct sigcontext sc;
                if (upeek(tcp->pid, PT_GPR15, &usp) < 0)
                        return 0;
                if (umove(tcp, usp + __SIGNAL_FRAMESIZE, &sc) < 0)
@@ -921,7 +921,7 @@ sys_sigreturn(struct tcb *tcp)
 #elif defined(POWERPC)
        if (entering(tcp)) {
                long esp;
-               struct sigcontext_struct sc;
+               struct sigcontext sc;
 
                esp = ppc_regs.gpr[1];
 
@@ -951,7 +951,7 @@ sys_sigreturn(struct tcb *tcp)
 #elif defined(ALPHA)
        if (entering(tcp)) {
                long fp;
-               struct sigcontext_struct sc;
+               struct sigcontext sc;
                if (upeek(tcp->pid, REG_FP, &fp) < 0)
                        return 0;
                if (umove(tcp, fp, &sc) < 0)