This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [Ada] More code clean up in mlib-tgt-*
- From: "Aaron W. LaFramboise" <aaronavay62 at aaronwl dot com>
- To: Arnaud Charlet <charlet at adacore dot com>
- Cc: gcc-patches at gcc dot gnu dot org, Vincent Celier <celier at adacore dot com>
- Date: Tue, 29 Jul 2008 09:10:10 -0500
- Subject: Re: [Ada] More code clean up in mlib-tgt-*
- References: <20080408083702.GA11921@adacore.com>
Hi Arnaud and Vincent,
Arnaud Charlet wrote:
Tested on i686-linux, committed on trunk
2008-04-08 Vincent Celier <celier@adacore.com>
Arnaud Charlet <charlet@adacore.com>
* Makefile.in:
(EXTRA_GNATRTL_NONTASKING_OBJS): Add s-win32.o
Index: Makefile.in
===================================================================
--- Makefile.in (revision 133957)
+++ Makefile.in (working copy)
...
@@ -1340,8 +1361,8 @@ ifeq ($(strip $(filter-out cygwin32% min
s-taprop.adb<s-taprop-mingw.adb \
system.ads<system-mingw.ads
- EXTRA_GNATRTL_NONTASKING_OBJS = g-regist.o
- EXTRA_GNATRTL_TASKING_OBJS=a-exetim.o
+ EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o s-win32.o g-regist.o
+ EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o
MISCLIB = -lwsock32
s-win32.o is added twice here, unintentionally I think. This is
breaking bootstrap with ada on i386-pc-mingw32 with errors about
redefinitions.
I've committed the attached patch as obvious, which allows the bootstrap
to proceed.
2008-07-29 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
* Makefile.in (EXTRA_GNATRTL_NONTASKING_OBJS): Remove extra s-win32.o.
Index: gcc/ada/Makefile.in
===================================================================
--- gcc/ada/Makefile.in (revision 138215)
+++ gcc/ada/Makefile.in (working copy)
@@ -1359,7 +1359,7 @@ ifeq ($(strip $(filter-out cygwin32% min
s-taprop.adb<s-taprop-mingw.adb \
system.ads<system-mingw.ads
- EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o s-win32.o g-regist.o
+ EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o g-regist.o
EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o
MISCLIB = -lwsock32