diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2014-03-12 11:19:05 +0000 |
|---|---|---|
| committer | Uros Bizjak <ubizjak@gmail.com> | 2014-03-12 11:19:05 +0000 |
| commit | faf5dd69c5c69deb229837fc8011920d52899fb7 (patch) | |
| tree | 355bda1f3daecf8e1a0ce680a123e88d404e57f8 /libjava | |
| parent | 15701d1dfb25c3eb03d1b9200edb29b2e3a9abcb (diff) | |
* include/dwarf2-signal.h: Update copyright year.
(SIGNAL_HANDLER): Remove _sip argument. Mark _p argument with
__attribute__ ((__unused__)).
(class java::lang::Throwable): Remove declaration.
(MAKE_THROW_FRAME) [!__ia64__]: Define as empty definition.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@208510 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/include/dwarf2-signal.h | 16 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 28468725b6f..fec6d8de642 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,11 @@ +2014-03-12 Uros Bizjak <ubizjak@gmail.com> + + * include/dwarf2-signal.h: Update copyright year. + (SIGNAL_HANDLER): Remove _sip argument. Mark _p argument with + __attribute__ ((__unused__)). + (class java::lang::Throwable): Remove declaration. + (MAKE_THROW_FRAME) [!__ia64__]: Define as empty definition. + 2014-03-11 Uros Bizjak <ubizjak@gmail.com> * java/lang/natObject.cc (_Jv_MonitorEnter): Add missing parenthesis diff --git a/libjava/include/dwarf2-signal.h b/libjava/include/dwarf2-signal.h index a064ab47249..ec5929c915d 100644 --- a/libjava/include/dwarf2-signal.h +++ b/libjava/include/dwarf2-signal.h @@ -1,6 +1,6 @@ // dwarf2-signal.h - Catch runtime signals and turn them into exceptions. -/* Copyright (C) 2000, 2001, 2009, 2011 Free Software Foundation +/* Copyright (C) 2000, 2001, 2009, 2011, 2014 Free Software Foundation This file is part of libgcj. @@ -20,10 +20,9 @@ details. */ #define HANDLE_SEGV 1 #undef HANDLE_FPE -#define SIGNAL_HANDLER(_name) \ -static void _Jv_##_name (int, siginfo_t *_sip, void *_p) - -class java::lang::Throwable; +#define SIGNAL_HANDLER(_name) \ +static void _Jv_##_name (int, siginfo_t *, \ + void *_p __attribute__ ((__unused__))) // Unwind the stack to the point at which the signal was generated and // then throw an exception. With the dwarf2 unwinder we don't usually @@ -47,12 +46,7 @@ do \ while (0) #else -#define MAKE_THROW_FRAME(_exception) \ -do \ -{ \ - (void)_p; \ -} \ -while (0) +#define MAKE_THROW_FRAME(_exception) #endif #if defined(__sparc__) |