Compliance with MIPS ABI and MIPS kernel changes.

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

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'.  */