summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-12 11:19:05 +0000
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-12 11:19:05 +0000
commit66473f0dcd1637df405e6b6346390f0b65e21006 (patch)
tree355bda1f3daecf8e1a0ce680a123e88d404e57f8 /libjava
parent88a7f155494c4548a0564369746a96f76a4d074f (diff)
downloadlinaro-gcc-66473f0dcd1637df405e6b6346390f0b65e21006.tar.gz
linaro-gcc-66473f0dcd1637df405e6b6346390f0b65e21006.tar.bz2
linaro-gcc-66473f0dcd1637df405e6b6346390f0b65e21006.zip
* 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: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208510 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog8
-rw-r--r--libjava/include/dwarf2-signal.h16
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__)