diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 18:18:41 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 18:18:41 +0000 |
| commit | a61cb3bea1aca152c8009ced4d2df127aa93fea0 (patch) | |
| tree | 93a0071fd6dae3b14c7ec33d862ac873d9f392b9 /libc/sysdeps/linux/mips/sigaction.c | |
| parent | 7e3edddc7225bb857b69f4bd1e5f530f4233fac5 (diff) | |
Merge from NPTL branch. Bring in the remaining changes for sigaction.
Diffstat (limited to 'libc/sysdeps/linux/mips/sigaction.c')
| -rw-r--r-- | libc/sysdeps/linux/mips/sigaction.c | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c index dfc259801..37637093f 100644 --- a/libc/sysdeps/linux/mips/sigaction.c +++ b/libc/sysdeps/linux/mips/sigaction.c @@ -37,22 +37,17 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa int result; struct kernel_sigaction kact, koact; -#ifdef SIGCANCEL - if (sig == SIGCANCEL) { - __set_errno (EINVAL); - return -1; - } -#endif - if (act) { kact.k_sa_handler = act->sa_handler; - __memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask)); + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask)); kact.sa_flags = act->sa_flags; - - kact.sa_flags = act->sa_flags | SA_RESTORER; -#ifdef HAVE_SA_RESTORER +# ifdef HAVE_SA_RESTORER +# if _MIPS_SIM == _ABIO32 kact.sa_restorer = act->sa_restorer; -#endif +# else + kact.sa_restorer = &restore_rt; +# endif +# endif } /* XXX The size argument hopefully will have to be changed to the @@ -62,11 +57,11 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa if (oact && result >= 0) { oact->sa_handler = koact.k_sa_handler; - __memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask)); + memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask)); oact->sa_flags = koact.sa_flags; -#ifdef HAVE_SA_RESTORER +# ifdef HAVE_SA_RESTORER oact->sa_restorer = koact.sa_restorer; -#endif +# endif } return result; } @@ -82,20 +77,17 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa int result; struct old_kernel_sigaction kact, koact; -#ifdef SIGCANCEL - if (sig == SIGCANCEL) { - __set_errno (EINVAL); - return -1; - } -#endif - if (act) { kact.k_sa_handler = act->sa_handler; kact.sa_mask = act->sa_mask.__val[0]; - kact.sa_flags = act->sa_flags | SA_RESTORER; -#ifdef HAVE_SA_RESTORER + kact.sa_flags = act->sa_flags; +# ifdef HAVE_SA_RESTORER +# if _MIPS_SIM == _ABIO32 kact.sa_restorer = act->sa_restorer; -#endif +# else + kact.sa_restorer = &restore_rt; +# endif +# endif } result = __syscall_sigaction(sig, act ? __ptrvalue (&kact) : NULL, @@ -110,13 +102,16 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa oact->sa_handler = koact.k_sa_handler; oact->sa_mask.__val[0] = koact.sa_mask; oact->sa_flags = koact.sa_flags; -#ifdef HAVE_SA_RESTORER +# ifdef HAVE_SA_RESTORER oact->sa_restorer = koact.sa_restorer; -#endif +# endif } return result; } #endif + +#ifndef LIBC_SIGACTION hidden_weak_alias(__libc_sigaction,__sigaction) weak_alias(__libc_sigaction,sigaction) +#endif |