Make-lang.in (EXTRA_GNATBIND_OBJS): Revert last change.

	* Make-lang.in (EXTRA_GNATBIND_OBJS): Revert last change.
	* raise.c [!IN_RTS]: Undef abort.

From-SVN: r86880

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 5d5187771efe1ad80166190799432f8c04c66a18..8132a2b28fa6da4302dde828be6ce02e6032c9bc 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-01  Andreas Schwab  <schwab@suse.de>
+
+       * Make-lang.in (EXTRA_GNATBIND_OBJS): Revert last change.
+       * raise.c [!IN_RTS]: Undef abort.
+
 2004-08-27  Nathan Sidwell  <nathan@codesourcery.com>
 
        * utils2.c (build_allocator): Use ssize_int.

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index a31042be0a6a633de8e932b7ce88a9882c6cc83e..2d303313302172683bfb81879dabee07e3643a93 100644 (file)
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -259,7 +259,7 @@ GNATBIND_OBJS = \
 
 # List of extra object files linked in with various programs.
 EXTRA_GNAT1_OBJS = prefix.o
-EXTRA_GNATBIND_OBJS = prefix.o version.o errors.o
+EXTRA_GNATBIND_OBJS = prefix.o version.o
 
 # Language-independent object files.
 ADA_BACKEND = $(BACKEND) attribs.o

diff --git a/gcc/ada/raise.c b/gcc/ada/raise.c
index 77f39370d550cca75bd19629e161b4435fe069bc..77a712b63edeb2b30bb5e3d74f913e5a3a632d36 100644 (file)
--- a/gcc/ada/raise.c
+++ b/gcc/ada/raise.c
@@ -1140,6 +1140,9 @@ __gnat_Unwind_ForcedUnwind (_Unwind_Exception *e,
    be using the GCC eh mechanism for the compiler, however, so expect these
    functions never to be called.  */
 
+/* We don't want fancy_abort here.  */
+#undef abort
+
 _Unwind_Reason_Code
 __gnat_Unwind_RaiseException (_Unwind_Exception *e ATTRIBUTE_UNUSED)
 {