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

libjava/ChangeLog

+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.

libjava/Makefile.am

@@ -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)

libjava/Makefile.in

@@ -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)

libjava/exception.cc

@@ -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 ();