diff options
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/exception.cc | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 738b017..f2e1efb 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2005-05-19 Richard Henderson <rth@redhat.com> + + * exception.cc: Revert 05-17 gcc_unreachable change. + 2005-05-19 Bryce McKinlay <mckinlay@redhat.com> * java/lang/natClassLoader.cc (_Jv_NewClass): Use diff --git a/libjava/exception.cc b/libjava/exception.cc index 4bab412..367df36 100644 --- a/libjava/exception.cc +++ b/libjava/exception.cc @@ -19,9 +19,17 @@ details. */ #include <gcj/cni.h> #include <jvm.h> -// Sometimes we compile libjava without libstdc++-v3. Therefore make -// sure we use stdlib.h's abort(). -#define gcc_unreachable() ::abort () +// unwind-pe.h uses std::abort(), but sometimes we compile libjava +// without libstdc++-v3. The following hack forces it to use +// stdlib.h's abort(). +namespace std +{ + static __attribute__ ((__noreturn__)) void + abort () + { + ::abort (); + } +} #include "unwind.h" struct alignment_test_struct |