diff options
Diffstat (limited to 'sysdeps/mach')
-rw-r--r-- | sysdeps/mach/hurd/alpha/sigreturn.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/alpha/trampoline.c | 8 | ||||
-rw-r--r-- | sysdeps/mach/hurd/fdopen.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/hppa/trampoline.c | 8 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/sigreturn.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/trampoline.c | 8 | ||||
-rw-r--r-- | sysdeps/mach/hurd/mips/sigreturn.c | 4 | ||||
-rw-r--r-- | sysdeps/mach/hurd/mips/trampoline.c | 8 | ||||
-rw-r--r-- | sysdeps/mach/hurd/sigaltstack.c | 7 | ||||
-rw-r--r-- | sysdeps/mach/hurd/sigstack.c | 7 |
10 files changed, 32 insertions, 30 deletions
diff --git a/sysdeps/mach/hurd/alpha/sigreturn.c b/sysdeps/mach/hurd/alpha/sigreturn.c index ff6e4edcaf..102b0231d8 100644 --- a/sysdeps/mach/hurd/alpha/sigreturn.c +++ b/sysdeps/mach/hurd/alpha/sigreturn.c @@ -1,5 +1,5 @@ /* Return from signal handler in GNU C library for Hurd. Alpha version. - Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -65,7 +65,7 @@ __sigreturn (struct sigcontext *scp) if (scp->sc_onstack) { - ss->sigaltstack.ss_flags &= ~SA_ONSTACK; /* XXX threadvars */ + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; /* XXX threadvars */ /* XXX cannot unlock until off sigstack */ abort (); } diff --git a/sysdeps/mach/hurd/alpha/trampoline.c b/sysdeps/mach/hurd/alpha/trampoline.c index b650478347..a1d0dfb5a7 100644 --- a/sysdeps/mach/hurd/alpha/trampoline.c +++ b/sysdeps/mach/hurd/alpha/trampoline.c @@ -1,5 +1,5 @@ /* Set thread_state for sighandler, and sigcontext to recover. Alpha version. - Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -86,10 +86,10 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, return NULL; if ((ss->actions[signo].sa_flags & SA_ONSTACK) && - !(ss->sigaltstack.ss_flags & (SA_DISABLE|SA_ONSTACK))) + !(ss->sigaltstack.ss_flags & (SS_DISABLE|SS_ONSTACK))) { sigsp = ss->sigaltstack.ss_sp + ss->sigaltstack.ss_size; - ss->sigaltstack.ss_flags |= SA_ONSTACK; + ss->sigaltstack.ss_flags |= SS_ONSTACK; /* XXX need to set up base of new stack for per-thread variables, cthreads. */ } @@ -114,7 +114,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, { /* Set up the sigcontext from the current state of the thread. */ - scp->sc_onstack = ss->sigaltstack.ss_flags & SA_ONSTACK ? 1 : 0; + scp->sc_onstack = ss->sigaltstack.ss_flags & SS_ONSTACK ? 1 : 0; /* struct sigcontext is laid out so that starting at sc_regs mimics a struct alpha_thread_state. */ diff --git a/sysdeps/mach/hurd/fdopen.c b/sysdeps/mach/hurd/fdopen.c index 5a3106d4a0..fcdf84e969 100644 --- a/sysdeps/mach/hurd/fdopen.c +++ b/sysdeps/mach/hurd/fdopen.c @@ -27,7 +27,7 @@ extern int __getmode __P ((const char *mode, __io_mode *mptr)); /* Open a new stream on a given system file descriptor. */ FILE * -fdopen (fd, mode) +__fdopen (fd, mode) int fd; const char *mode; { @@ -68,3 +68,5 @@ fdopen (fd, mode) return stream; } + +weak_alias (__fdopen, fdopen) diff --git a/sysdeps/mach/hurd/hppa/trampoline.c b/sysdeps/mach/hurd/hppa/trampoline.c index ceb16235fe..b046b945a4 100644 --- a/sysdeps/mach/hurd/hppa/trampoline.c +++ b/sysdeps/mach/hurd/hppa/trampoline.c @@ -1,5 +1,5 @@ /* Set thread_state for sighandler, and sigcontext to recover. HPPA version. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -75,10 +75,10 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, return NULL; if ((ss->actions[signo].sa_flags & SA_ONSTACK) && - !(ss->sigaltstack.ss_flags & (SA_DISABLE|SA_ONSTACK))) + !(ss->sigaltstack.ss_flags & (SS_DISABLE|SS_ONSTACK))) { sigsp = ss->sigaltstack.ss_sp + ss->sigaltstack.ss_size; - ss->sigaltstack.ss_flags |= SA_ONSTACK; + ss->sigaltstack.ss_flags |= SS_ONSTACK; /* XXX need to set up base of new stack for per-thread variables, cthreads. */ } @@ -104,7 +104,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, /* Set up the sigcontext from the current state of the thread. */ - scp->sc_onstack = ss->sigaltstack.ss_flags & SA_ONSTACK ? 1 : 0; + scp->sc_onstack = ss->sigaltstack.ss_flags & SS_ONSTACK ? 1 : 0; /* struct sigcontext is laid out so that starting at sc_regs mimics a struct parisc_thread_state. */ diff --git a/sysdeps/mach/hurd/i386/sigreturn.c b/sysdeps/mach/hurd/i386/sigreturn.c index 002a4e10a4..334351d285 100644 --- a/sysdeps/mach/hurd/i386/sigreturn.c +++ b/sysdeps/mach/hurd/i386/sigreturn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 94, 95, 96, 97 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 94, 95, 96, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -68,7 +68,7 @@ __sigreturn (struct sigcontext *scp) if (scp->sc_onstack) { - ss->sigaltstack.ss_flags &= ~SA_ONSTACK; /* XXX threadvars */ + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; /* XXX threadvars */ /* XXX cannot unlock until off sigstack */ abort (); } diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c index 5841c60a01..4c1fa60e2e 100644 --- a/sysdeps/mach/hurd/i386/trampoline.c +++ b/sysdeps/mach/hurd/i386/trampoline.c @@ -1,5 +1,5 @@ /* Set thread_state for sighandler, and sigcontext to recover. i386 version. - Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -74,10 +74,10 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, state->basic.esp = state->basic.uesp; if ((ss->actions[signo].sa_flags & SA_ONSTACK) && - !(ss->sigaltstack.ss_flags & (SA_DISABLE|SA_ONSTACK))) + !(ss->sigaltstack.ss_flags & (SS_DISABLE|SS_ONSTACK))) { sigsp = ss->sigaltstack.ss_sp + ss->sigaltstack.ss_size; - ss->sigaltstack.ss_flags |= SA_ONSTACK; + ss->sigaltstack.ss_flags |= SS_ONSTACK; /* XXX need to set up base of new stack for per-thread variables, cthreads. */ } @@ -144,7 +144,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, /* Set up the sigcontext from the current state of the thread. */ - scp->sc_onstack = ss->sigaltstack.ss_flags & SA_ONSTACK ? 1 : 0; + scp->sc_onstack = ss->sigaltstack.ss_flags & SS_ONSTACK ? 1 : 0; /* struct sigcontext is laid out so that starting at sc_gs mimics a struct i386_thread_state. */ diff --git a/sysdeps/mach/hurd/mips/sigreturn.c b/sysdeps/mach/hurd/mips/sigreturn.c index fe38fac1df..0e775736bd 100644 --- a/sysdeps/mach/hurd/mips/sigreturn.c +++ b/sysdeps/mach/hurd/mips/sigreturn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -64,7 +64,7 @@ __sigreturn (struct sigcontext *scp) if (scp->sc_onstack) { - ss->sigaltstack.ss_flags &= ~SA_ONSTACK; /* XXX threadvars */ + ss->sigaltstack.ss_flags &= ~SS_ONSTACK; /* XXX threadvars */ /* XXX cannot unlock until off sigstack */ abort (); } diff --git a/sysdeps/mach/hurd/mips/trampoline.c b/sysdeps/mach/hurd/mips/trampoline.c index fbb7df508f..284b95c330 100644 --- a/sysdeps/mach/hurd/mips/trampoline.c +++ b/sysdeps/mach/hurd/mips/trampoline.c @@ -1,5 +1,5 @@ /* Set thread_state for sighandler, and sigcontext to recover. MIPS version. - Copyright (C) 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -77,10 +77,10 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, state->basic.r16 = state->basic.r29; if ((ss->actions[signo].sa_flags & SA_ONSTACK) && - !(ss->sigaltstack.ss_flags & (SA_DISABLE|SA_ONSTACK))) + !(ss->sigaltstack.ss_flags & (SS_DISABLE|SS_ONSTACK))) { sigsp = ss->sigaltstack.ss_sp + ss->sigaltstack.ss_size; - ss->sigaltstack.ss_flags |= SA_ONSTACK; + ss->sigaltstack.ss_flags |= SS_ONSTACK; /* XXX need to set up base of new stack for per-thread variables, cthreads. */ } @@ -129,7 +129,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler, /* Set up the sigcontext from the current state of the thread. */ - scp->sc_onstack = ss->sigaltstack.ss_flags & SA_ONSTACK ? 1 : 0; + scp->sc_onstack = ss->sigaltstack.ss_flags & SS_ONSTACK ? 1 : 0; /* struct sigcontext is laid out so that starting at sc_gpr mimics a struct mips_thread_state. */ diff --git a/sysdeps/mach/hurd/sigaltstack.c b/sysdeps/mach/hurd/sigaltstack.c index 659b6b87a8..2981796995 100644 --- a/sysdeps/mach/hurd/sigaltstack.c +++ b/sysdeps/mach/hurd/sigaltstack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1993, 1994, 1995, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 93, 94, 95, 97, 98 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,7 +23,7 @@ /* Run signals handlers on the stack specified by SS (if not NULL). If OSS is not NULL, it is filled in with the old signal stack status. */ int -sigaltstack (argss, oss) +__sigaltstack (argss, oss) const struct sigaltstack *argss; struct sigaltstack *oss; { @@ -40,7 +40,7 @@ sigaltstack (argss, oss) __spin_lock (&s->lock); if (argss != NULL && - (ss.ss_flags & SA_DISABLE) && (s->sigaltstack.ss_flags & SA_ONSTACK)) + (ss.ss_flags & SS_DISABLE) && (s->sigaltstack.ss_flags & SS_ONSTACK)) { /* Can't disable a stack that is in use. */ __spin_unlock (&s->lock); @@ -60,3 +60,4 @@ sigaltstack (argss, oss) return 0; } +weak_alias(__sigaltstack, sigaltstack) diff --git a/sysdeps/mach/hurd/sigstack.c b/sysdeps/mach/hurd/sigstack.c index d6044ece04..0f5afbaf99 100644 --- a/sysdeps/mach/hurd/sigstack.c +++ b/sysdeps/mach/hurd/sigstack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -22,7 +22,6 @@ /* Run signals handlers on the stack specified by SS (if not NULL). If OSS is not NULL, it is filled in with the old signal stack status. */ -/* XXX should be __sigstack ? */ int sigstack (ss, oss) const struct sigstack *ss; @@ -34,13 +33,13 @@ sigstack (ss, oss) as.ss_size = 0; as.ss_flags = 0; - if (sigaltstack (&as, &oas) < 0) + if (__sigaltstack (&as, &oas) < 0) return -1; if (oss != NULL) { oss->ss_sp = oas.ss_sp; - oss->ss_onstack = oas.ss_flags & SA_ONSTACK; + oss->ss_onstack = oas.ss_flags & SS_ONSTACK; } return 0; |