This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[PATCH] [Ada] Remove duplicated code in win32 run-time
- 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, Pascal Obry <obry at adacore dot com>
- Date: Tue, 29 Jul 2008 15:44:31 -0500
- Subject: [PATCH] [Ada] Remove duplicated code in win32 run-time
- References: <20080408083652.GA11649@adacore.com>
Arnaud Charlet wrote:
Tested on i686-mingw, committed on trunk
2008-04-08 Pascal Obry <obry@adacore.com>
* a-exetim-mingw.adb, s-gloloc-mingw.adb, s-taprop-mingw.adb,
s-tasinf-mingw.ad{s,b}, s-taspri-mingw.ads:
Use new s-win32.ads unit instead of declaration
from s-osinte-mingw.ads.
* s-osinte-mingw.ads:
Move all non tasking based interface to s-win32.ads.
* s-osprim-mingw.adb:
Remove duplicated declarations and use s-win32.ads
unit instead.
* s-win32.ads, s-winext.ads: New files.
On trunk 2008-07-29, I get this failure bootstrapping with ada:
make -C ../gcc/ada/tools -f ../Makefile \
"CC=../../xgcc -B../../" "CFLAGS=-g -O2 -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -fno-common" "LDFLAGS=" "ADAFLAGS=-gnatpg -gnata" "INCLUDES=-I. -I.. -I../.. -I/mingw/src/svn/gcc/ada -I/mingw/src/svn/gcc/ada/../config -I/mingw/src/svn/gcc/ada/../../include -I/mingw/src/svn/gcc/ada/.." "ADA_INCLUDES=-I- -I../rts -I. -I/mingw/src/svn/gcc/ada" "exeext=.exe" "fsrcdir=/mingw/src/svn/gcc/ada" "srcdir=/mingw/src/svn/gcc/ada" "GNATBIND=../../gnatbind" "TOOLSCASE=native" \
../../gnatmake.exe ../../gnatlink.exe
make[3]: Entering directory `/mingw/src/gccf/gcc/ada/tools'
../../gnatbind -C -I- -I../rts -I. -I/mingw/src/svn/gcc/ada -o b_gnatm.c gnatmake.ali
error: "s-winext.ali" not found, "s-winext.ads" must be compiled
Apparently s-winext.ads was never added to the Makefile. The attached
patch fixes this, and it allows Ada to bootstrap successfully on
i386-pc-mingw32.
OK to commit?
2008-07-29 Aaron W. LaFramboise <aaronavay62@aaronwl.com>
* Makefile.in (EXTRA_GNATRTL_NONTASKING_OBJS) [WINDOWS]: Add s-winext.o.
Index: gcc/ada/Makefile.in
===================================================================
--- gcc/ada/Makefile.in (revision 138245)
+++ gcc/ada/Makefile.in (working copy)
@@ -1342,7 +1342,7 @@ ifeq ($(strip $(filter-out cygwin32% min
s-taprop.adb<s-taprop-rtx.adb \
system.ads<system-rtx.ads
- EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o
+ EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o s-winext.o
MISCLIB = -lwsock32 -lrtapi_w32
THREADSLIB=-lrtapi_w32
@@ -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 g-regist.o
+ EXTRA_GNATRTL_NONTASKING_OBJS = s-win32.o s-winext.o g-regist.o
EXTRA_GNATRTL_TASKING_OBJS = a-exetim.o
MISCLIB = -lwsock32