diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/exception.cc | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 21c35ad..585acb2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2005-05-17 Nathan Sidwell <nathan@codesourcery.com> + + * exception.cc (abort): Remove std::abort hack. + (gcc_unreacheable): Define. + 2005-05-17 Paolo Bonzini <bonzini@gnu.org> * Makefile.am (Makefile.deps): Do not create native.list and diff --git a/libjava/exception.cc b/libjava/exception.cc index 367df36..4bab412 100644 --- a/libjava/exception.cc +++ b/libjava/exception.cc @@ -19,17 +19,9 @@ details. */ #include <gcj/cni.h> #include <jvm.h> -// 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 (); - } -} +// Sometimes we compile libjava without libstdc++-v3. Therefore make +// sure we use stdlib.h's abort(). +#define gcc_unreachable() ::abort () #include "unwind.h" struct alignment_test_struct |