diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-17 15:37:47 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-17 15:37:47 +0000 |
| commit | 515361411b7d2acf4d1deed616f6024a41fc4e2b (patch) | |
| tree | 386dad5929e3765399d5b24a1e7d76be228b6d15 /libjava | |
| parent | c4bcc7e4f771d2823affb6d869d83797f21c1b0c (diff) | |
| download | gcc-515361411b7d2acf4d1deed616f6024a41fc4e2b.tar.gz | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99835 138bc75d-0d04-0410-961f-82ee72b054a4
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 21c35ad0cfc..585acb2271e 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 367df3618b9..4bab412d5ba 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 |