diff options
| author | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-20 01:28:35 +0000 |
|---|---|---|
| committer | rth <rth@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-20 01:28:35 +0000 |
| commit | 9e7b62cab8e5262fbd50f92a9d7a9d9a86100b02 (patch) | |
| tree | 8b9eebf264967aa25bf62ed3795d2c340ed070d5 /libjava | |
| parent | d65ede2b5a6e366f8b6fa265ab69a54a100f3e82 (diff) | |
| download | gcc-9e7b62cab8e5262fbd50f92a9d7a9d9a86100b02.tar.gz | |
* exception.cc: Revert 05-17 gcc_unreachable change.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@100004 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -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 738b017e5f0..f2e1efb64fd 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 4bab412d5ba..367df3618b9 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 |