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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 412256e41bbf6e84f4ccec092e910741dd034bc9..87b03af40ba5369091e813169778d5ef1ed66f96 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -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.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 36ea2d07f0c7e59447c91f23aaf5140e239df0be..8cc666c0685e627b104d64b3edb3c83621d9cf62 100644 (file)
--- a/libjava/Makefile.am
+++ b/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)

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index bab064703c98ae973ae037b1abb1054668fbe1c1..70015d9e47d9d39645bd86aa83c9d36c244e7440 100644 (file)
--- a/libjava/Makefile.in
+++ b/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)

diff --git a/libjava/exception.cc b/libjava/exception.cc
index 30ef55c078cdd673b11400ef66050dfe71966611..b8b9634e94d9a5ea92d786f831eeafb85d0a2e0e 100644 (file)
--- a/libjava/exception.cc
+++ b/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 ();