summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2003-03-11 16:54:43 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2003-03-11 16:54:43 +0000
commit763a62315d878d0b12686343b1a285d3e2554f99 (patch)
tree9fd8470c7912e6eaad0c4909d01562c551815c72 /libc/sysdeps/linux
parent83ea9cd4cf47b0dd80452f59f437197ee491ece1 (diff)
Compliance with MIPS ABI and MIPS kernel changes.
Diffstat (limited to 'libc/sysdeps/linux')
-rw-r--r--libc/sysdeps/linux/common/bits/kernel_sigaction.h11
-rw-r--r--libc/sysdeps/linux/mips/bits/sigaction.h8
2 files changed, 2 insertions, 17 deletions
diff --git a/libc/sysdeps/linux/common/bits/kernel_sigaction.h b/libc/sysdeps/linux/common/bits/kernel_sigaction.h
index d6d6d2af8..502b8a189 100644
--- a/libc/sysdeps/linux/common/bits/kernel_sigaction.h
+++ b/libc/sysdeps/linux/common/bits/kernel_sigaction.h
@@ -34,20 +34,13 @@ struct kernel_sigaction {
sigset_t sa_mask;
};
#elif defined(__mips__)
-#define HAVE_SA_RESTORER
+#undef HAVE_SA_RESTORER
/* This is the sigaction structure from the Linux 2.1.24 kernel. */
#include <sgidefs.h>
struct old_kernel_sigaction {
- unsigned int sa_flags;
__sighandler_t k_sa_handler;
+ unsigned int sa_flags;
unsigned long sa_mask;
- unsigned int __pad0[3]; /* reserved, keep size constant */
- /* Abi says here follows reserved int[2] */
- void (*sa_restorer)(void);
-#if (_MIPS_ISA == _MIPS_ISA_MIPS1) || (_MIPS_ISA == _MIPS_ISA_MIPS2)
- /* For 32 bit code we have to pad struct sigaction to get
- * constant size for the ABI */
- int pad1[1]; /* reserved */
#endif
};
#define _KERNEL_NSIG 128
diff --git a/libc/sysdeps/linux/mips/bits/sigaction.h b/libc/sysdeps/linux/mips/bits/sigaction.h
index 93a759817..6bf77a11c 100644
--- a/libc/sysdeps/linux/mips/bits/sigaction.h
+++ b/libc/sysdeps/linux/mips/bits/sigaction.h
@@ -44,14 +44,6 @@ struct sigaction
#endif
/* Additional set of signals to be blocked. */
__sigset_t sa_mask;
-
- /* The ABI says here are two unused ints following. */
- /* Restore handler. */
- void (*sa_restorer) (void);
-
-#if _MIPS_ISA == _MIPS_ISA_MIPS1 || _MIPS_ISA == _MIPS_ISA_MIPS2
- int sa_resv[1];
-#endif
};
/* Bits in `sa_flags'. */