OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

exception.cc (_Jv_Throw, [...]): Changed std::abort() to simply abort().

Browse Source 
2002-02-11  Adam Megacz <adam@xwt.org>

    * exception.cc (_Jv_Throw, PERSONALITY_FUNCTION): Changed
    std::abort() to simply abort(). Also added "fake" std::abort() so
    we can #include unwind-pe.h without having to link against
    libstdc++-v3.

From-SVN: r49685
This commit is contained in:
Adam Megacz 2002-02-11 22:28:58 +00:00 committed by Adam Megacz
parent d6e06ddc10
commit 1e41e84370
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2002-02-11 Adam Megacz <adam@xwt.org>
* exception.cc (_Jv_Throw, PERSONALITY_FUNCTION): Changed
std::abort() to simply abort(). Also added "fake" std::abort() so
we can #include unwind-pe.h without having to link against
libstdc++-v3.
2002-02-10 Andreas Tobler <toa@pop.agri.ch>
* interpret.cc (continue1) [insn_f2l]: Use PUSHL, not PUSHI.

17
libjava/exception.cc
View File

@ -11,16 +11,25 @@ details. */
#include <config.h>
#include <stddef.h>
#include <cstdlib>
#include <stdlib.h>
#include <java/lang/Class.h>
#include <java/lang/NullPointerException.h>
#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
{
void abort ()
{
::abort ();
}
}
#include "unwind.h"
struct alignment_test_struct
{
char space;
@ -97,7 +106,7 @@ _Jv_Throw (jthrowable value)
recover. As is the way of such things, almost certainly we will have
crashed before now, rather than actually being able to diagnose the
problem. */
std::abort ();
abort();
}
@ -344,7 +353,7 @@ PERSONALITY_FUNCTION (int version,
// ??? Perhaps better to make them an index into a table
// of null-terminated strings instead of playing games
// with Utf8Const+1 as above.
std::abort ();
abort ();
}
if (ar_disp == 0)