aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>2000-06-16 15:52:24 +0000
committerTom Tromey <tromey@gcc.gnu.org>2000-06-16 15:52:24 +0000
commit3fff847575d71de33fe0e55e5708e432273d3cee (patch)
treeb26f15bc191070504835578695d63fbab9780692
parentbf3428d0b60d92b52699e4def461ad33f5ae0ce6 (diff)
downloadgcc-3fff847575d71de33fe0e55e5708e432273d3cee.zip
gcc-3fff847575d71de33fe0e55e5708e432273d3cee.tar.gz
gcc-3fff847575d71de33fe0e55e5708e432273d3cee.tar.bz2
re GNATS libgcj/261 (Macro-inconsistency)
Fix for PR libgcj/261: * include/win32-signal.h (MAKE_THROW_FRAME): Added `_exception' argument. * include/sparc-signal.h (MAKE_THROW_FRAME): Added `_exception' argument. (This is a patch from long ago that somehow went missing.) From-SVN: r34575
-rw-r--r--libjava/ChangeLog9
-rw-r--r--libjava/include/sparc-signal.h4
-rw-r--r--libjava/include/win32-signal.h4
3 files changed, 13 insertions, 4 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 70d4430..befafdd 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2000-06-16 Tom Tromey <tromey@cygnus.com>
+
+ Fix for PR libgcj/261:
+ * include/win32-signal.h (MAKE_THROW_FRAME): Added `_exception'
+ argument.
+ * include/sparc-signal.h (MAKE_THROW_FRAME): Added `_exception'
+ argument. (This is a patch from long ago that somehow went
+ missing.)
+
2000-06-15 Tom Tromey <tromey@cygnus.com>
* gnu/gcj/convert/natIconv.cc (iconv_adapter): New function.
diff --git a/libjava/include/sparc-signal.h b/libjava/include/sparc-signal.h
index 4ae0c95..03538ec 100644
--- a/libjava/include/sparc-signal.h
+++ b/libjava/include/sparc-signal.h
@@ -1,6 +1,6 @@
// sparc-signal.h - Catch runtime signals and turn them into exceptions.
-/* Copyright (C) 1998, 1999 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
@@ -23,7 +23,7 @@ static void _name (int _dummy, siginfo_t *_info, void *arg)
#define FLUSH_REGISTER_WINDOWS \
asm volatile ("ta 3");
-#define MAKE_THROW_FRAME \
+#define MAKE_THROW_FRAME(_exception) \
do \
{ \
ucontext_t *_context = (ucontext_t *) arg; \
diff --git a/libjava/include/win32-signal.h b/libjava/include/win32-signal.h
index b4a60be..e12c3c3 100644
--- a/libjava/include/win32-signal.h
+++ b/libjava/include/win32-signal.h
@@ -1,6 +1,6 @@
// win32-signal.h - Catch runtime signals and turn them into exceptions.
-/* Copyright (C) 1998, 1999 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
This file is part of libgcj.
@@ -20,7 +20,7 @@ details. */
#define SIGNAL_HANDLER(_name) \
static void _name (int _dummy)
-#define MAKE_THROW_FRAME do {} while (0)
+#define MAKE_THROW_FRAME(_exception) do {} while (0)
#define HANDLE_DIVIDE_OVERFLOW do {} while (0)
#define INIT_SEGV \