]>
Commit | Line | Data |
---|---|---|
b53d1f41 MF |
1 | Index: libc/sysdeps/linux/mips/bits/sigaction.h |
2 | =================================================================== | |
3 | --- libc/sysdeps/linux/mips/bits/sigaction.h (revision 11027) | |
4 | +++ libc/sysdeps/linux/mips/bits/sigaction.h (revision 11025) | |
5 | @@ -1,6 +1,5 @@ | |
6 | /* The proper definitions for Linux/MIPS's sigaction. | |
7 | - Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2003 | |
8 | - Free Software Foundation, Inc. | |
9 | + Copyright (C) 1993,94,95,97,98,99,2000 Free Software Foundation, Inc. | |
10 | This file is part of the GNU C Library. | |
11 | ||
12 | The GNU C Library is free software; you can redistribute it and/or | |
13 | @@ -45,14 +44,6 @@ | |
14 | #endif | |
15 | /* Additional set of signals to be blocked. */ | |
16 | __sigset_t sa_mask; | |
17 | - | |
18 | - /* The ABI says here are two unused ints following. */ | |
19 | - /* Restore handler. */ | |
20 | - void (*sa_restorer) (void); | |
21 | - | |
22 | -#if _MIPS_SZPTR < 64 | |
23 | - int sa_resv[1]; | |
24 | -#endif | |
25 | }; | |
26 | ||
27 | /* Bits in `sa_flags'. */ | |
28 | Index: libc/sysdeps/linux/mips/bits/kernel_sigaction.h | |
29 | =================================================================== | |
30 | --- libc/sysdeps/linux/mips/bits/kernel_sigaction.h (revision 11027) | |
31 | +++ /dev/null (revision 11025) | |
32 | @@ -1,40 +0,0 @@ | |
33 | -/* This is the sigaction structure from the Linux 2.1.24 kernel. */ | |
34 | - | |
35 | -#include <sgidefs.h> | |
36 | - | |
37 | -#define HAVE_SA_RESTORER | |
38 | - | |
39 | -struct old_kernel_sigaction { | |
40 | - unsigned int sa_flags; | |
41 | - __sighandler_t k_sa_handler; | |
42 | - unsigned long sa_mask; | |
43 | - unsigned int __pad0[3]; /* reserved, keep size constant */ | |
44 | - | |
45 | - /* Abi says here follows reserved int[2] */ | |
46 | - void (*sa_restorer)(void); | |
47 | -#if (_MIPS_SZPTR < 64) | |
48 | - /* | |
49 | - * For 32 bit code we have to pad struct sigaction to get | |
50 | - * constant size for the ABI | |
51 | - */ | |
52 | - int pad1[1]; /* reserved */ | |
53 | -#endif | |
54 | -}; | |
55 | - | |
56 | - | |
57 | -#define _KERNEL_NSIG 128 | |
58 | -#define _KERNEL_NSIG_BPW _MIPS_SZLONG | |
59 | -#define _KERNEL_NSIG_WORDS (_KERNEL_NSIG / _KERNEL_NSIG_BPW) | |
60 | - | |
61 | -typedef struct { | |
62 | - unsigned long sig[_KERNEL_NSIG_WORDS]; | |
63 | -} kernel_sigset_t; | |
64 | - | |
65 | -/* This is the sigaction structure from the Linux 2.1.68 kernel. */ | |
66 | -struct kernel_sigaction { | |
67 | - unsigned int sa_flags; | |
68 | - __sighandler_t k_sa_handler; | |
69 | - kernel_sigset_t sa_mask; | |
70 | - void (*sa_restorer)(void); | |
71 | - int s_resv[1]; /* reserved */ | |
72 | -}; | |
73 | Index: libc/sysdeps/linux/mips/Makefile | |
74 | =================================================================== | |
75 | --- libc/sysdeps/linux/mips/Makefile (revision 11027) | |
76 | +++ libc/sysdeps/linux/mips/Makefile (revision 11025) | |
77 | @@ -28,7 +28,7 @@ | |
78 | SOBJS=$(patsubst %.S,%.o, $(SSRC)) | |
79 | ||
80 | CSRC=__longjmp.c brk.c setjmp_aux.c mmap.c __syscall_error.c \ | |
81 | - cacheflush.c pread_write.c sysmips.c _test_and_set.c sigaction.c | |
82 | + cacheflush.c pread_write.c sysmips.c _test_and_set.c #sigaction.c | |
83 | COBJS=$(patsubst %.c,%.o, $(CSRC)) | |
84 | ||
85 | OBJS=$(SOBJS) $(COBJS) |