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

exception.cc: Don't #include "exception". 

2000-10-13  Bryce McKinlay  <bryce@albatross.co.nz>

	* exception.cc: Don't #include "exception".
	(_Jv_eh_alloc): Call abort (), not terminate (), if malloc fails.

	* Makefile.am (libgcj_la_LDFLAGS): Link in libsupc++.
	* Makefile.in: Updated.

From-SVN: r36855
This commit is contained in:
Bryce McKinlay 2000-10-13 04:45:57 +00:00 committed by Bryce McKinlay
parent 3c1d1e7b7f
commit c26f7a3165
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/ChangeLog
View File

@ -1,3 +1,11 @@
2000-10-13 Bryce McKinlay <bryce@albatross.co.nz>
* exception.cc: Don't #include "exception".
(_Jv_eh_alloc): Call abort (), not terminate (), if malloc fails.
* Makefile.am (libgcj_la_LDFLAGS): Link in libsupc++.
* Makefile.in: Updated.
2000-10-11 Bryce McKinlay <bryce@albatross.co.nz>
* java/awt/peer/ChoicePeer.java (addItem): Removed.

2
libjava/Makefile.am
View File

@ -124,7 +124,7 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
$(c_files) $(GCOBJS) $(THREADOBJS) $(LIBLTDL)
libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
$(THREADOBJS) $(libffi_files) $(LIBLTDL)
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \
## The mysterious backslash is consumed by make.
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LINK = $(LIBLINK)

2
libjava/Makefile.in
View File

@ -202,7 +202,7 @@ libgcj_la_DEPENDENCIES = libgcj.zip $(javao_files) $(nat_files) \
libgcj_la_LIBADD = $(javao_files) $(nat_files) $(c_files) $(GCOBJS) \
$(THREADOBJS) $(libffi_files) $(LIBLTDL)
libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) \
libgcj_la_LDFLAGS = -lsupc++ -rpath $(toolexeclibdir) \
-version-info `grep -v '^\#' $(srcdir)/libtool-version`
libgcj_la_LINK = $(LIBLINK)

3
libjava/exception.cc
View File

@ -10,7 +10,6 @@ details. */
#include <config.h>
#include "exception"
#include <stddef.h>
#include <stdlib.h>
@ -101,7 +100,7 @@ _Jv_eh_alloc ()
apparently can sometimes free() this value itself. */
java_eh_info *p = (java_eh_info *) malloc (sizeof (java_eh_info));
if (p == 0)
terminate ();
abort ();
p->value = 0;
java_eh_info ** info_ptr = __get_eh_info ();