From a1a82749bab505e884b71c83c37bac9e78b7112d Mon Sep 17 00:00:00 2001 From: John David Anglin Date: Wed, 9 Dec 2009 21:31:49 +0000 Subject: pa-signal.h: Do not include ucontext.h. * include/pa-signal.h: Do not include ucontext.h. (SIGNAL_HANDLER): Add __attribute__ ((unused)) to signal handler arguments. (MAKE_THROW_FRAME): Do not adjust program counter. * include/hppa-signal.h: Do not include sys/types.h, sys/syscall.h and unistd.h. (MAKE_THROW_FRAME): Do not adjust program counter. (HANDLE_FPE): Define. (INIT_SEGV, INIT_FPE): Revise indentation. From-SVN: r155116 --- libjava/include/pa-signal.h | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'libjava/include/pa-signal.h') diff --git a/libjava/include/pa-signal.h b/libjava/include/pa-signal.h index 0f7c054..add1325 100644 --- a/libjava/include/pa-signal.h +++ b/libjava/include/pa-signal.h @@ -1,6 +1,6 @@ // pa-signal.h - Catch runtime signals and turn them into exceptions. -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2009 Free Software Foundation This file is part of libgcj. @@ -12,29 +12,17 @@ details. */ #define JAVA_SIGNAL_H 1 #include -#include #include #define HANDLE_SEGV 1 #define HANDLE_FPE 1 -#define SIGNAL_HANDLER(_name) \ -static void _Jv_##_name (int _dummy, siginfo_t *_info, void *arg) +#define SIGNAL_HANDLER(_name) \ +static void _Jv_##_name (int _dummy __attribute__ ((unused)), \ + siginfo_t *_info __attribute__ ((__unused__)), \ + void *arg __attribute__ ((__unused__))) -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - struct ucontext *uc = (struct ucontext *)arg; \ - struct sigcontext *sc = &uc->uc_mcontext; \ - (void)_dummy; \ - (void)_info; \ - /* Advance the program counter so that it is after the start \ - of the instruction: the exception handler expects \ - the PC to point to the instruction after a call. */ \ - sc->sc_iaoq[0] = sc->sc_iaoq[1]; \ - sc->sc_iaoq[1] += 4; \ -} \ -while (0) +#define MAKE_THROW_FRAME(_exception) #define INIT_SEGV \ do \ -- cgit v1.1