From 79d0dfa314d6b7d1db89735809d7f7f19b5efd86 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Tue, 17 May 2005 15:37:47 +0000 Subject: unwind-dw2-fde-glibc.c (base_from_cb_data, [...]): Use gcc_assert and gcc_unreachable as appropriate. * unwind-dw2-fde-glibc.c (base_from_cb_data, _Unwind_IteratePhdrCallback): Use gcc_assert and gcc_unreachable as appropriate. * unwind-dw2-fde.c (__deregister_frame_info_bases, base_from_object, fde_split, end_fde_sort): Likewise. * unwind-dw2.c (_Unwind_GetGR, _Unwind_SetGR, execute_stack_op, execute_cfa_program, _Unwind_SetSpColumn, uw_update_context_1, uw_init_context_1): Likewise. * unwind.inc (_Unwind_RaiseException_Phase2, _Unwind_Resume, _Unwind_Resume_or_Rethrow): Likewise. * unwind-pe.h (__gxx_abort): Do not define. (size_of_encoded_value, base_of_encoded_value, read_encoded_value_with_base): Use gcc_unreachable. * unwind.h (_Unwind_GetTextRelBase): Likewise. From-SVN: r99835 --- libjava/ChangeLog | 5 +++++ libjava/exception.cc | 14 +++----------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'libjava') 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 + + * exception.cc (abort): Remove std::abort hack. + (gcc_unreacheable): Define. + 2005-05-17 Paolo Bonzini * 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 #include -// 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 -- cgit v1.1