diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2005-05-17 15:37:47 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2005-05-17 15:37:47 +0000 |
| commit | 79d0dfa314d6b7d1db89735809d7f7f19b5efd86 (patch) | |
| tree | 386dad5929e3765399d5b24a1e7d76be228b6d15 /libjava/exception.cc | |
| parent | d0f11b16532d9c96c3a32ec284bd4470c67ba4b4 (diff) | |
| download | gcc-79d0dfa314d6b7d1db89735809d7f7f19b5efd86.zip gcc-79d0dfa314d6b7d1db89735809d7f7f19b5efd86.tar.gz gcc-79d0dfa314d6b7d1db89735809d7f7f19b5efd86.tar.bz2 | |
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
Diffstat (limited to 'libjava/exception.cc')
| -rw-r--r-- | libjava/exception.cc | 14 |
1 files changed, 3 insertions, 11 deletions
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 |