From 4eb104c16c811d4c895711bc9cb2f2c3c9602fe7 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 1 Sep 2004 10:46:47 +0000 Subject: [PATCH] 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 --- gcc/ada/ChangeLog | 5 +++++ gcc/ada/Make-lang.in | 2 +- gcc/ada/raise.c | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 5d5187771ef..8132a2b28fa 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2004-09-01 Andreas Schwab + + * Make-lang.in (EXTRA_GNATBIND_OBJS): Revert last change. + * raise.c [!IN_RTS]: Undef abort. + 2004-08-27 Nathan Sidwell * utils2.c (build_allocator): Use ssize_int. diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index a31042be0a6..2d303313302 100644 --- 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 77f39370d55..77a712b63ed 100644 --- 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) { -- 2.30.2