From: danglin Date: Wed, 9 Dec 2009 21:31:49 +0000 (+0000) Subject: * include/pa-signal.h: Do not include ucontext.h. X-Git-Tag: upstream/4.9.2~31980 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=20881312386a41806c79d3e25baed96aef3e42a3;p=platform%2Fupstream%2Flinaro-gcc.git * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@155116 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 632d66a..adef878 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2009-12-09 John David Anglin + + * 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. + 2009-12-09 Bryce McKinlay PR java/41991 diff --git a/libjava/include/hppa-signal.h b/libjava/include/hppa-signal.h index ac4cac5..116a62e 100644 --- a/libjava/include/hppa-signal.h +++ b/libjava/include/hppa-signal.h @@ -1,7 +1,7 @@ /* hppa-signal.h - Catch runtime signals and turn them into exceptions, on a HP-UX 11 PA system. */ -/* Copyright (C) 2006 Free Software Foundation +/* Copyright (C) 2006, 2009 Free Software Foundation This file is part of libgcj. @@ -9,60 +9,41 @@ This software is copyrighted work licensed under the terms of the Libgcj License. Please consult the file "LIBGCJ_LICENSE" for details. */ -/* This file is really more of a specification. The rest of the system - should be arranged so that this Just Works. */ - #ifndef JAVA_SIGNAL_H -# define JAVA_SIGNAL_H 1 +#define JAVA_SIGNAL_H 1 -#include #include -#include -#include -# define HANDLE_SEGV 1 -# undef HANDLE_FPE +#define HANDLE_SEGV 1 +#define HANDLE_FPE 1 #define SIGNAL_HANDLER(_name) \ - static void _name (int _dummy __attribute__ ((unused)), \ - siginfo_t *_info __attribute__ ((__unused__)), \ - void *arg __attribute__ ((__unused__))) - -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - ucontext_t *_context = (ucontext_t *) arg; \ - (void)_dummy; \ - (void)_info; \ - mcontext_t *mc = &(_context->uc_mcontext); \ - SetSSReg (mc, ss_pcoq_head, GetSSReg (mc, ss_pcoq_tail)); \ - SetSSReg (mc, ss_pcsq_head, GetSSReg (mc, ss_pcsq_tail)); \ - /* This part is not quit right if the head pc was pointing \ - at a branch. The tail needs to be adjusted to the branch \ - target if the branch is taken. The tail space register \ - may need adjustment as well if the branch is an interspace \ - branch. */ \ - SetSSReg (mc, ss_pcoq_tail, (GetSSReg (mc, ss_pcoq_tail) + 4)); \ - \ - } \ +static void _name (int _dummy __attribute__ ((unused)), \ + siginfo_t *_info __attribute__ ((__unused__)), \ + void *arg __attribute__ ((__unused__))) + +#define MAKE_THROW_FRAME(_exception) + +#define INIT_SEGV \ +do \ + { \ + struct sigaction sa; \ + sa.sa_sigaction = catch_segv; \ + sigemptyset (&sa.sa_mask); \ + sa.sa_flags = SA_SIGINFO | SA_NODEFER; \ + sigaction (SIGSEGV, &sa, NULL); \ + } \ while (0) -# define INIT_SEGV \ - do { \ - struct sigaction sa; \ - sa.sa_sigaction = catch_segv; \ - sigemptyset (&sa.sa_mask); \ - sa.sa_flags = SA_SIGINFO | SA_NODEFER; \ - sigaction (SIGSEGV, &sa, NULL); \ - } while (0) - -# define INIT_FPE \ - do { \ - struct sigaction sa; \ - sa.sa_sigaction = catch_fpe; \ - sigemptyset (&sa.sa_mask); \ - sa.sa_flags = SA_SIGINFO | SA_NODEFER; \ - sigaction (SIGFPE, &sa, NULL); \ - } while (0) +#define INIT_FPE \ +do \ + { \ + struct sigaction sa; \ + sa.sa_sigaction = catch_fpe; \ + sigemptyset (&sa.sa_mask); \ + sa.sa_flags = SA_SIGINFO | SA_NODEFER; \ + sigaction (SIGFPE, &sa, NULL); \ + } \ +while (0) #endif /* JAVA_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 \