1
# DP: - Introduce a new shared library named libgnatvsn, containing
2
# DP: common components of GNAT under the GNAT-Modified GPL, for
3
# DP: use in GNAT tools, ASIS, GLADE and GPS. Link the gnat tools
4
# DP: against this new library.
6
# This patch seems large, but the hunks in Makefile.in are actually
7
# generated from Makefile.def using autogen.
9
# !!! Must be applied after ada-link-lib.dpatch
11
Index: b/src/gnattools/Makefile.in
12
===================================================================
13
--- a/src/gnattools/Makefile.in
14
+++ b/src/gnattools/Makefile.in
17
INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
19
-ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
20
+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn
21
LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
22
- @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
23
+ ../libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
24
ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
25
+ADA_LIBS += -L../libgnatvsn -lgnatvsn
27
# We will use the just-built compiler to compile and link everything.
28
GCC=../gcc/xgcc -B../gcc/
30
# Since we don't have gnatmake, we must specify the full list of
31
# object files necessary to build gnatmake and gnatlink.
32
# TODO: remove from these lists the objects that are part of
33
-# libgnatvsn and libgnatprj.
107
@@ -155,47 +124,59 @@
138
$(EXTRA_GNATMAKE_OBJS)
140
+EXTRA_TOOLS_OBJS = \
160
+OBJECTS = $(GNATLINK_OBJS) $(GNATMAKE_OBJS) $(EXTRA_TOOLS_OBJS)
165
.PHONY: gnattools gnattools-native gnattools-cross regnattools
166
gnattools: @default_gnattools_target@
168
-# Build directory for the tools. Let's copy the target-dependent
169
-# sources using the same mechanism as for gnatlib. The other sources are
170
-# accessed using the vpath directive.
171
+BODIES := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.adb,$(f))))
172
+SPECS := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.ads,$(f))))
174
+$(notdir $(SPECS) $(BODIES)): stamp-gnattools-sources
176
stamp-gnattools-sources:
177
- $(LN_S) ../gcc/ada/sdefault.adb .
178
+ for file in $(BODIES) $(SPECS); do \
179
+ $(LN_S) -f $$file .; \
181
+ rm -f sdefault.adb; $(LN_S) ../gcc/ada/sdefault.adb .
182
$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
183
rm -f $(word 1,$(subst <, ,$(PAIR)));\
184
$(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
188
gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
189
+gnattools-native: ../libgnatvsn/libgnatvsn.so
190
gnattools-native: stamp-gnattools-sources
191
gnattools-native: $(TOOLS)
193
@@ -210,18 +192,16 @@
195
vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
196
vpath %.h @srcdir@/../gcc/ada
197
-vpath %.adb .:@srcdir@/../gcc/ada
198
-vpath %.ads @srcdir@/../gcc/ada
200
# Because the just-built gcc is a host tool like us, we can use some
201
-# of its object files, e.g. prefix.o and version.o.
202
+# of its object files, e.g. prefix.o.
203
vpath prefix.o ../gcc
204
-vpath version.o ../gcc
208
gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
210
+ ../libgnatvsn/libgnatvsn.a \
211
../gcc/ada/rts/libgnat.a \
212
../libiberty/libiberty.a
216
gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
217
$(GCC) -o $@ $(ADA_CFLAGS) $^ \
218
+ ../libgnatvsn/libgnatvsn.a \
219
../gcc/ada/rts/libgnat.a \
220
../libiberty/libiberty.a
223
../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
228
+ if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi
229
./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
231
--GNATBIND=../gcc/gnatbind
235
gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref: \
236
-link.o version.o prefix.o
238
+ if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi
239
./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
241
--GNATBIND=../gcc/gnatbind
244
$(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
251
@@ -325,13 +310,15 @@
252
.PHONY: install install-strip install-info install-pdf install-html
255
+.PHONY: mostlyclean clean distclean
258
$(RM) gnatmake gnatlink $(TOOLS) *.o *.ali
262
$(RM) *.ads *.adb stamp-gnattools-sources
266
$(RM) Makefile config.status config.log
269
Index: b/src/libgnatvsn/configure
270
===================================================================
272
+++ b/src/libgnatvsn/configure
276
+# Minimal configure script for libgnatvsn. We're only interested in
282
+ build=`expr ${arg} : '--build=\(.\+\)'`;;
284
+ host=`expr ${arg} : '--host=\(.\+\)'`;;
286
+ target=`expr ${arg} : '--target=\(.\+\)'`;;
288
+ prefix=`expr ${arg} : '--prefix=\(.\+\)'`;;
290
+ srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;;
292
+ libdir=`expr ${arg} : '--libdir=\(.\+\)'`;;
293
+ --with-pkgversion=*)
294
+ pkgversion=`expr ${arg} : '--with-pkgversion=\(.\+\)'`;;
296
+ bugurl=`expr ${arg} : '--with-bugurl=\(.\+\)'`;;
298
+ echo "Warning: ignoring option: ${arg}"
302
+echo "build: ${build}" | tee config.log
303
+echo "host: ${host}" | tee -a config.log
304
+echo "target: ${target}" | tee -a config.log
305
+echo "prefix: ${prefix}" | tee -a config.log
306
+echo "srcdir: ${srcdir}" | tee -a config.log
307
+echo "libdir: ${libdir}" | tee -a config.log
308
+echo "pkgversion: ${pkgversion}" | tee -a config.log
309
+echo "bugurl: ${bugurl}" | tee -a config.log
311
+echo "Creating Makefile..." | tee -a config.log
312
+sed -e "s,@build@,${build},g" \
313
+ -e "s,@host@,${host},g" \
314
+ -e "s,@target@,${target},g" \
315
+ -e "s,@prefix@,${prefix},g" \
316
+ -e "s,@srcdir@,${srcdir},g" \
317
+ -e "s,@libdir@,${libdir},g" \
318
+ -e "s,@PKGVERSION@,${pkgversion},g" \
319
+ -e "s,@REPORT_BUGS_TO@,${bugurl},g" \
320
+ < ${srcdir}/Makefile.in > Makefile
321
Index: b/src/libgnatvsn/Makefile.in
322
===================================================================
324
+++ b/src/libgnatvsn/Makefile.in
326
+# Makefile for libgnatvsn.
327
+# Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org>
329
+# This file is free software; you can redistribute it and/or modify
330
+# it under the terms of the GNU General Public License as published by
331
+# the Free Software Foundation; either version 2 of the License, or
332
+# (at your option) any later version.
334
+# This program is distributed in the hope that it will be useful,
335
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
336
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
337
+# GNU General Public License for more details.
339
+# You should have received a copy of the GNU General Public License
340
+# along with this program; if not, write to the Free Software
341
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
343
+# Default target; must be first.
348
+CPUS := $(shell getconf _NPROCESSORS_ONLN)
349
+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
350
+ @srcdir@/../gcc/ada/gnatvsn.ads | \
351
+ sed -e 's/.*"\(.*\)".*/\1/'))
352
+GCC:=../gcc/xgcc -B../gcc/
353
+LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts
354
+CFLAGS := -g -O2 -gnatn
355
+BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
356
+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
357
+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
359
+# For use in version.c - double quoted strings, with appropriate
360
+# surrounding punctuation and spaces, and with the datestamp and
361
+# development phase collapsed to the empty string in release mode
362
+# (i.e. if DEVPHASE_c is empty). The space immediately after the
363
+# comma in the $(if ...) constructs is significant - do not remove it.
364
+BASEVER_s := "\"$(BASEVER)\""
365
+DEVPHASE_s := "\"$(if $(DEVPHASE), ($(DEVPHASE)))\""
366
+DATESTAMP_s := "\"$(if $(DEVPHASE), $(DATESTAMP))\""
367
+PKGVERSION_s:= "\"@PKGVERSION@\""
368
+BUGURL_s := "\"@REPORT_BUGS_TO@\""
370
+ifneq (@build@,@host@)
371
+ CFLAGS += -b @host@
374
+.PHONY: libgnatvsn install
375
+libgnatvsn: libgnatvsn.so.$(LIB_VERSION) libgnatvsn.a
377
+VSN_SOURCES := alloc.ads aspects.adb atree.adb casing.adb csets.adb debug.adb einfo.adb \
378
+elists.adb fname.adb gnatvsn.adb hostparm.ads krunch.adb lib.adb namet.adb \
379
+nlists.adb opt.adb output.adb repinfo.adb scans.adb sinfo.adb sem_aux.adb \
380
+sinput.adb stand.adb stringt.adb table.adb tree_in.adb tree_io.adb types.adb \
381
+uintp.adb uname.adb urealp.adb widechar.adb
383
+VSN_SEPARATES := lib-list.adb lib-sort.adb
385
+VSN_GENERATED_SOURCES := snames.adb
387
+OBJECTS=$(patsubst %.ads,%.o,$(VSN_SOURCES:.adb=.o) $(VSN_GENERATED_SOURCES:.adb=.o)) version.o
389
+vpath %.c @srcdir@/../gcc
391
+libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
392
+ : # Make libgnatvsn.so
393
+ $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
394
+ -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
395
+ ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
396
+ chmod a=r obj-shared/*.ali
397
+# Make the .ali files, but not the .o files, visible to the gnat tools.
398
+ cp -lp obj-shared/*.ali .
400
+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-shared
402
+obj-shared/%.o: %.adb
403
+ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
405
+obj-shared/%.o: %.ads
406
+ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
408
+obj-shared/version.o: version.c
409
+ $(GCC) -c -fPIC -g -O2 \
410
+ -DBASEVER=$(BASEVER_s) \
411
+ -DDATESTAMP=$(DATESTAMP_s) \
412
+ -DDEVPHASE=$(DEVPHASE_s) \
413
+ -DPKGVERSION=$(PKGVERSION_s) \
414
+ -DBUGURL=$(BUGURL_s) \
416
+ $(realpath $<) -o $@
421
+libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS))
422
+ : # Make libgnatvsn.a
426
+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-static
428
+obj-static/%.o: %.adb
429
+ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
431
+obj-static/%.o: %.ads
432
+ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
434
+obj-static/version.o: version.c
436
+ -DBASEVER=$(BASEVER_s) \
437
+ -DDATESTAMP=$(DATESTAMP_s) \
438
+ -DDEVPHASE=$(DEVPHASE_s) \
439
+ -DPKGVERSION=$(PKGVERSION_s) \
440
+ -DBUGURL=$(BUGURL_s) \
447
+$(VSN_SOURCES) $(VSN_SEPARATES) $(VSN_GENERATED_SOURCES): stamp-libgnatvsn-sources
449
+stamp-libgnatvsn-sources:
450
+ for file in $(VSN_SOURCES) $(VSN_SEPARATES); do \
451
+ ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
452
+ if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then ln -s @srcdir@/../gcc/ada/$$file .; fi; \
453
+ if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then ln -s @srcdir@/../gcc/ada/$$ads .; fi; \
455
+ for file in $(VSN_GENERATED_SOURCES); do \
456
+ ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
457
+ if [ -f ../gcc/ada/$$file -a ! -L $$file ] ; then ln -s ../gcc/ada/$$file .; fi; \
458
+ if [ -f ../gcc/ada/$$ads -a ! -L $$ads ] ; then ln -s ../gcc/ada/$$ads .; fi; \
465
+ $(INSTALL_DATA) libgnatvsn.a $(DESTDIR)$(libdir)
466
+ $(INSTALL_DATA) libgnatvsn.so.$(LIB_VERSION) $(DESTDIR)$(libdir)
467
+ cd $(DESTDIR)$(libdir); ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
468
+ mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
470
+ $(addprefix @srcdir@/../gcc/ada/,$(VSN_SOURCES) $(VSN_SEPARATES)) \
471
+ $(addprefix @srcdir@/../gcc/ada/,$(patsubst %.adb,%.ads,$(filter %.adb,$(VSN_SOURCES)))) \
472
+ $(addprefix ../gcc/ada/,$(VSN_GENERATED_SOURCES)) \
473
+ $(addprefix ../gcc/ada/,$(patsubst %.adb,%.ads,$(VSN_GENERATED_SOURCES))) \
474
+ $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
475
+ mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
476
+ $(INSTALL) -m 0444 obj-shared/*.ali \
477
+ $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
478
+ chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn/*.ali
482
+ rm -rf *.ali obj-static obj-shared libgnatvsn* *.adb *.ads stamp*
483
Index: b/src/Makefile.def
484
===================================================================
485
--- a/src/Makefile.def
486
+++ b/src/Makefile.def
489
missing= install-info;
490
missing= installcheck; };
491
+host_modules= { module= libgnatvsn; no_check=true;
496
+ missing= install-info;
497
+ missing= installcheck; };
498
host_modules= { module= gnattools; no_check=true;
503
missing= install-info;
504
missing= installcheck; };
505
+target_modules = { module= libgnatvsn; no_check=true;
510
+ missing= install-info;
511
+ missing= installcheck; };
512
target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
514
// These are (some of) the make targets to be done in each subdirectory.
516
dependencies = { module=all-fixincludes; on=all-libiberty; };
518
dependencies = { module=all-gnattools; on=all-libada; };
519
+dependencies = { module=all-gnattools; on=all-libgnatvsn; };
520
+dependencies = { module=all-libgnatvsn; on=all-libada; };
522
dependencies = { module=all-lto-plugin; on=all-libiberty; };
524
Index: b/src/Makefile.in
525
===================================================================
526
--- a/src/Makefile.in
527
+++ b/src/Makefile.in
529
maybe-configure-libtermcap \
530
maybe-configure-utils \
531
maybe-configure-libada \
532
+ maybe-configure-libgnatvsn \
533
maybe-configure-gnattools \
534
maybe-configure-lto-plugin
535
.PHONY: configure-target
537
maybe-configure-target-qthreads \
538
maybe-configure-target-rda \
539
maybe-configure-target-libada \
540
+ maybe-configure-target-libgnatvsn \
541
maybe-configure-target-libgomp
543
# The target built for a native non-bootstrap build.
544
@@ -1129,6 +1131,7 @@
545
all-host: maybe-all-libtermcap
546
all-host: maybe-all-utils
547
all-host: maybe-all-libada
548
+all-host: maybe-all-libgnatvsn
549
all-host: maybe-all-gnattools
550
@if lto-plugin-no-bootstrap
551
all-host: maybe-all-lto-plugin
552
@@ -1162,6 +1165,7 @@
553
all-target: maybe-all-target-qthreads
554
all-target: maybe-all-target-rda
555
all-target: maybe-all-target-libada
556
+all-target: maybe-all-target-libgnatvsn
557
@if target-libgomp-no-bootstrap
558
all-target: maybe-all-target-libgomp
559
@endif target-libgomp-no-bootstrap
560
@@ -1259,6 +1263,7 @@
561
info-host: maybe-info-libtermcap
562
info-host: maybe-info-utils
563
info-host: maybe-info-libada
564
+info-host: maybe-info-libgnatvsn
565
info-host: maybe-info-gnattools
566
info-host: maybe-info-lto-plugin
568
@@ -1286,6 +1291,7 @@
569
info-target: maybe-info-target-qthreads
570
info-target: maybe-info-target-rda
571
info-target: maybe-info-target-libada
572
+info-target: maybe-info-target-libgnatvsn
573
info-target: maybe-info-target-libgomp
576
@@ -1376,6 +1382,7 @@
577
dvi-host: maybe-dvi-libtermcap
578
dvi-host: maybe-dvi-utils
579
dvi-host: maybe-dvi-libada
580
+dvi-host: maybe-dvi-libgnatvsn
581
dvi-host: maybe-dvi-gnattools
582
dvi-host: maybe-dvi-lto-plugin
584
@@ -1403,6 +1410,7 @@
585
dvi-target: maybe-dvi-target-qthreads
586
dvi-target: maybe-dvi-target-rda
587
dvi-target: maybe-dvi-target-libada
588
+dvi-target: maybe-dvi-target-libgnatvsn
589
dvi-target: maybe-dvi-target-libgomp
592
@@ -1493,6 +1501,7 @@
593
pdf-host: maybe-pdf-libtermcap
594
pdf-host: maybe-pdf-utils
595
pdf-host: maybe-pdf-libada
596
+pdf-host: maybe-pdf-libgnatvsn
597
pdf-host: maybe-pdf-gnattools
598
pdf-host: maybe-pdf-lto-plugin
600
@@ -1520,6 +1529,7 @@
601
pdf-target: maybe-pdf-target-qthreads
602
pdf-target: maybe-pdf-target-rda
603
pdf-target: maybe-pdf-target-libada
604
+pdf-target: maybe-pdf-target-libgnatvsn
605
pdf-target: maybe-pdf-target-libgomp
608
@@ -1610,6 +1620,7 @@
609
html-host: maybe-html-libtermcap
610
html-host: maybe-html-utils
611
html-host: maybe-html-libada
612
+html-host: maybe-html-libgnatvsn
613
html-host: maybe-html-gnattools
614
html-host: maybe-html-lto-plugin
616
@@ -1637,6 +1648,7 @@
617
html-target: maybe-html-target-qthreads
618
html-target: maybe-html-target-rda
619
html-target: maybe-html-target-libada
620
+html-target: maybe-html-target-libgnatvsn
621
html-target: maybe-html-target-libgomp
624
@@ -1727,6 +1739,7 @@
625
TAGS-host: maybe-TAGS-libtermcap
626
TAGS-host: maybe-TAGS-utils
627
TAGS-host: maybe-TAGS-libada
628
+TAGS-host: maybe-TAGS-libgnatvsn
629
TAGS-host: maybe-TAGS-gnattools
630
TAGS-host: maybe-TAGS-lto-plugin
632
@@ -1754,6 +1767,7 @@
633
TAGS-target: maybe-TAGS-target-qthreads
634
TAGS-target: maybe-TAGS-target-rda
635
TAGS-target: maybe-TAGS-target-libada
636
+TAGS-target: maybe-TAGS-target-libgnatvsn
637
TAGS-target: maybe-TAGS-target-libgomp
639
.PHONY: do-install-info
640
@@ -1844,6 +1858,7 @@
641
install-info-host: maybe-install-info-libtermcap
642
install-info-host: maybe-install-info-utils
643
install-info-host: maybe-install-info-libada
644
+install-info-host: maybe-install-info-libgnatvsn
645
install-info-host: maybe-install-info-gnattools
646
install-info-host: maybe-install-info-lto-plugin
648
@@ -1871,6 +1886,7 @@
649
install-info-target: maybe-install-info-target-qthreads
650
install-info-target: maybe-install-info-target-rda
651
install-info-target: maybe-install-info-target-libada
652
+install-info-target: maybe-install-info-target-libgnatvsn
653
install-info-target: maybe-install-info-target-libgomp
655
.PHONY: do-install-pdf
656
@@ -1961,6 +1977,7 @@
657
install-pdf-host: maybe-install-pdf-libtermcap
658
install-pdf-host: maybe-install-pdf-utils
659
install-pdf-host: maybe-install-pdf-libada
660
+install-pdf-host: maybe-install-pdf-libgnatvsn
661
install-pdf-host: maybe-install-pdf-gnattools
662
install-pdf-host: maybe-install-pdf-lto-plugin
664
@@ -1988,6 +2005,7 @@
665
install-pdf-target: maybe-install-pdf-target-qthreads
666
install-pdf-target: maybe-install-pdf-target-rda
667
install-pdf-target: maybe-install-pdf-target-libada
668
+install-pdf-target: maybe-install-pdf-target-libgnatvsn
669
install-pdf-target: maybe-install-pdf-target-libgomp
671
.PHONY: do-install-html
672
@@ -2078,6 +2096,7 @@
673
install-html-host: maybe-install-html-libtermcap
674
install-html-host: maybe-install-html-utils
675
install-html-host: maybe-install-html-libada
676
+install-html-host: maybe-install-html-libgnatvsn
677
install-html-host: maybe-install-html-gnattools
678
install-html-host: maybe-install-html-lto-plugin
680
@@ -2105,6 +2124,7 @@
681
install-html-target: maybe-install-html-target-qthreads
682
install-html-target: maybe-install-html-target-rda
683
install-html-target: maybe-install-html-target-libada
684
+install-html-target: maybe-install-html-target-libgnatvsn
685
install-html-target: maybe-install-html-target-libgomp
687
.PHONY: do-installcheck
688
@@ -2195,6 +2215,7 @@
689
installcheck-host: maybe-installcheck-libtermcap
690
installcheck-host: maybe-installcheck-utils
691
installcheck-host: maybe-installcheck-libada
692
+installcheck-host: maybe-installcheck-libgnatvsn
693
installcheck-host: maybe-installcheck-gnattools
694
installcheck-host: maybe-installcheck-lto-plugin
696
@@ -2222,6 +2243,7 @@
697
installcheck-target: maybe-installcheck-target-qthreads
698
installcheck-target: maybe-installcheck-target-rda
699
installcheck-target: maybe-installcheck-target-libada
700
+installcheck-target: maybe-installcheck-target-libgnatvsn
701
installcheck-target: maybe-installcheck-target-libgomp
703
.PHONY: do-mostlyclean
704
@@ -2312,6 +2334,7 @@
705
mostlyclean-host: maybe-mostlyclean-libtermcap
706
mostlyclean-host: maybe-mostlyclean-utils
707
mostlyclean-host: maybe-mostlyclean-libada
708
+mostlyclean-host: maybe-mostlyclean-libgnatvsn
709
mostlyclean-host: maybe-mostlyclean-gnattools
710
mostlyclean-host: maybe-mostlyclean-lto-plugin
712
@@ -2339,6 +2362,7 @@
713
mostlyclean-target: maybe-mostlyclean-target-qthreads
714
mostlyclean-target: maybe-mostlyclean-target-rda
715
mostlyclean-target: maybe-mostlyclean-target-libada
716
+mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
717
mostlyclean-target: maybe-mostlyclean-target-libgomp
720
@@ -2429,6 +2453,7 @@
721
clean-host: maybe-clean-libtermcap
722
clean-host: maybe-clean-utils
723
clean-host: maybe-clean-libada
724
+clean-host: maybe-clean-libgnatvsn
725
clean-host: maybe-clean-gnattools
726
clean-host: maybe-clean-lto-plugin
728
@@ -2456,6 +2481,7 @@
729
clean-target: maybe-clean-target-qthreads
730
clean-target: maybe-clean-target-rda
731
clean-target: maybe-clean-target-libada
732
+clean-target: maybe-clean-target-libgnatvsn
733
clean-target: maybe-clean-target-libgomp
736
@@ -2546,6 +2572,7 @@
737
distclean-host: maybe-distclean-libtermcap
738
distclean-host: maybe-distclean-utils
739
distclean-host: maybe-distclean-libada
740
+distclean-host: maybe-distclean-libgnatvsn
741
distclean-host: maybe-distclean-gnattools
742
distclean-host: maybe-distclean-lto-plugin
744
@@ -2573,6 +2600,7 @@
745
distclean-target: maybe-distclean-target-qthreads
746
distclean-target: maybe-distclean-target-rda
747
distclean-target: maybe-distclean-target-libada
748
+distclean-target: maybe-distclean-target-libgnatvsn
749
distclean-target: maybe-distclean-target-libgomp
751
.PHONY: do-maintainer-clean
752
@@ -2663,6 +2691,7 @@
753
maintainer-clean-host: maybe-maintainer-clean-libtermcap
754
maintainer-clean-host: maybe-maintainer-clean-utils
755
maintainer-clean-host: maybe-maintainer-clean-libada
756
+maintainer-clean-host: maybe-maintainer-clean-libgnatvsn
757
maintainer-clean-host: maybe-maintainer-clean-gnattools
758
maintainer-clean-host: maybe-maintainer-clean-lto-plugin
760
@@ -2690,6 +2719,7 @@
761
maintainer-clean-target: maybe-maintainer-clean-target-qthreads
762
maintainer-clean-target: maybe-maintainer-clean-target-rda
763
maintainer-clean-target: maybe-maintainer-clean-target-libada
764
+maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
765
maintainer-clean-target: maybe-maintainer-clean-target-libgomp
768
@@ -2835,6 +2865,7 @@
769
maybe-check-libtermcap \
772
+ maybe-check-libgnatvsn \
773
maybe-check-gnattools \
774
maybe-check-lto-plugin
776
@@ -2862,6 +2893,7 @@
777
maybe-check-target-qthreads \
778
maybe-check-target-rda \
779
maybe-check-target-libada \
780
+ maybe-check-target-libgnatvsn \
781
maybe-check-target-libgomp
784
@@ -2978,6 +3010,7 @@
785
maybe-install-libtermcap \
786
maybe-install-utils \
787
maybe-install-libada \
788
+ maybe-install-libgnatvsn \
789
maybe-install-gnattools \
790
maybe-install-lto-plugin
792
@@ -3060,6 +3093,7 @@
793
maybe-install-libtermcap \
794
maybe-install-utils \
795
maybe-install-libada \
796
+ maybe-install-libgnatvsn \
797
maybe-install-gnattools \
798
maybe-install-lto-plugin
800
@@ -3087,6 +3121,7 @@
801
maybe-install-target-qthreads \
802
maybe-install-target-rda \
803
maybe-install-target-libada \
804
+ maybe-install-target-libgnatvsn \
805
maybe-install-target-libgomp
808
@@ -3196,6 +3231,7 @@
809
maybe-install-strip-libtermcap \
810
maybe-install-strip-utils \
811
maybe-install-strip-libada \
812
+ maybe-install-strip-libgnatvsn \
813
maybe-install-strip-gnattools \
814
maybe-install-strip-lto-plugin
816
@@ -3223,6 +3259,7 @@
817
maybe-install-strip-target-qthreads \
818
maybe-install-strip-target-rda \
819
maybe-install-strip-target-libada \
820
+ maybe-install-strip-target-libgnatvsn \
821
maybe-install-strip-target-libgomp
824
@@ -45128,6 +45165,343 @@
828
+.PHONY: configure-libgnatvsn maybe-configure-libgnatvsn
829
+maybe-configure-libgnatvsn:
831
+configure-libgnatvsn: stage_current
832
+@endif gcc-bootstrap
834
+maybe-configure-libgnatvsn: configure-libgnatvsn
835
+configure-libgnatvsn:
836
+ @: $(MAKE); $(unstage)
837
+ @r=`${PWD_COMMAND}`; export r; \
838
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
839
+ test ! -f $(HOST_SUBDIR)/libgnatvsn/Makefile || exit 0; \
840
+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatvsn ; \
842
+ echo Configuring in $(HOST_SUBDIR)/libgnatvsn; \
843
+ cd "$(HOST_SUBDIR)/libgnatvsn" || exit 1; \
844
+ case $(srcdir) in \
845
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
846
+ *) topdir=`echo $(HOST_SUBDIR)/libgnatvsn/ | \
847
+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
849
+ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
850
+ libsrcdir="$$s/libgnatvsn"; \
851
+ $(SHELL) $${libsrcdir}/configure \
852
+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
853
+ --target=${target_alias} $${srcdiroption} \
861
+.PHONY: all-libgnatvsn maybe-all-libgnatvsn
862
+maybe-all-libgnatvsn:
864
+all-libgnatvsn: stage_current
865
+@endif gcc-bootstrap
867
+TARGET-libgnatvsn=all
868
+maybe-all-libgnatvsn: all-libgnatvsn
869
+all-libgnatvsn: configure-libgnatvsn
870
+ @: $(MAKE); $(unstage)
871
+ @r=`${PWD_COMMAND}`; export r; \
872
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
874
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
875
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) \
876
+ $(TARGET-libgnatvsn))
882
+.PHONY: check-libgnatvsn maybe-check-libgnatvsn
883
+maybe-check-libgnatvsn:
885
+maybe-check-libgnatvsn: check-libgnatvsn
891
+.PHONY: install-libgnatvsn maybe-install-libgnatvsn
892
+maybe-install-libgnatvsn:
894
+maybe-install-libgnatvsn: install-libgnatvsn
896
+install-libgnatvsn: installdirs
897
+ @: $(MAKE); $(unstage)
898
+ @r=`${PWD_COMMAND}`; export r; \
899
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
901
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
902
+ $(MAKE) $(FLAGS_TO_PASS) install)
906
+.PHONY: install-strip-libgnatvsn maybe-install-strip-libgnatvsn
907
+maybe-install-strip-libgnatvsn:
909
+maybe-install-strip-libgnatvsn: install-strip-libgnatvsn
911
+install-strip-libgnatvsn: installdirs
912
+ @: $(MAKE); $(unstage)
913
+ @r=`${PWD_COMMAND}`; export r; \
914
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
916
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
917
+ $(MAKE) $(FLAGS_TO_PASS) install-strip)
921
+# Other targets (info, dvi, pdf, etc.)
923
+.PHONY: maybe-info-libgnatvsn info-libgnatvsn
924
+maybe-info-libgnatvsn:
926
+maybe-info-libgnatvsn: info-libgnatvsn
928
+# libgnatvsn doesn't support info.
933
+.PHONY: maybe-dvi-libgnatvsn dvi-libgnatvsn
934
+maybe-dvi-libgnatvsn:
936
+maybe-dvi-libgnatvsn: dvi-libgnatvsn
938
+# libgnatvsn doesn't support dvi.
943
+.PHONY: maybe-pdf-libgnatvsn pdf-libgnatvsn
944
+maybe-pdf-libgnatvsn:
946
+maybe-pdf-libgnatvsn: pdf-libgnatvsn
949
+ configure-libgnatvsn
950
+ @: $(MAKE); $(unstage)
951
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
952
+ r=`${PWD_COMMAND}`; export r; \
953
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
955
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
956
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
958
+ echo "Doing pdf in libgnatvsn" ; \
959
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
960
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
961
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
962
+ "RANLIB=$${RANLIB}" \
963
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
969
+.PHONY: maybe-html-libgnatvsn html-libgnatvsn
970
+maybe-html-libgnatvsn:
972
+maybe-html-libgnatvsn: html-libgnatvsn
974
+# libgnatvsn doesn't support html.
979
+.PHONY: maybe-TAGS-libgnatvsn TAGS-libgnatvsn
980
+maybe-TAGS-libgnatvsn:
982
+maybe-TAGS-libgnatvsn: TAGS-libgnatvsn
984
+# libgnatvsn doesn't support TAGS.
989
+.PHONY: maybe-install-info-libgnatvsn install-info-libgnatvsn
990
+maybe-install-info-libgnatvsn:
992
+maybe-install-info-libgnatvsn: install-info-libgnatvsn
994
+# libgnatvsn doesn't support install-info.
995
+install-info-libgnatvsn:
999
+.PHONY: maybe-install-pdf-libgnatvsn install-pdf-libgnatvsn
1000
+maybe-install-pdf-libgnatvsn:
1002
+maybe-install-pdf-libgnatvsn: install-pdf-libgnatvsn
1004
+install-pdf-libgnatvsn: \
1005
+ configure-libgnatvsn \
1007
+ @: $(MAKE); $(unstage)
1008
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1009
+ r=`${PWD_COMMAND}`; export r; \
1010
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1012
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1013
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1015
+ echo "Doing install-pdf in libgnatvsn" ; \
1016
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1017
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1018
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1019
+ "RANLIB=$${RANLIB}" \
1020
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1026
+.PHONY: maybe-install-html-libgnatvsn install-html-libgnatvsn
1027
+maybe-install-html-libgnatvsn:
1029
+maybe-install-html-libgnatvsn: install-html-libgnatvsn
1031
+install-html-libgnatvsn: \
1032
+ configure-libgnatvsn \
1034
+ @: $(MAKE); $(unstage)
1035
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1036
+ r=`${PWD_COMMAND}`; export r; \
1037
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1039
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1040
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1042
+ echo "Doing install-html in libgnatvsn" ; \
1043
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1044
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1045
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1046
+ "RANLIB=$${RANLIB}" \
1047
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1053
+.PHONY: maybe-installcheck-libgnatvsn installcheck-libgnatvsn
1054
+maybe-installcheck-libgnatvsn:
1056
+maybe-installcheck-libgnatvsn: installcheck-libgnatvsn
1058
+# libgnatvsn doesn't support installcheck.
1059
+installcheck-libgnatvsn:
1063
+.PHONY: maybe-mostlyclean-libgnatvsn mostlyclean-libgnatvsn
1064
+maybe-mostlyclean-libgnatvsn:
1066
+maybe-mostlyclean-libgnatvsn: mostlyclean-libgnatvsn
1068
+mostlyclean-libgnatvsn:
1069
+ @: $(MAKE); $(unstage)
1070
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1071
+ r=`${PWD_COMMAND}`; export r; \
1072
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1074
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1075
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1077
+ echo "Doing mostlyclean in libgnatvsn" ; \
1078
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1079
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1080
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1081
+ "RANLIB=$${RANLIB}" \
1082
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1088
+.PHONY: maybe-clean-libgnatvsn clean-libgnatvsn
1089
+maybe-clean-libgnatvsn:
1091
+maybe-clean-libgnatvsn: clean-libgnatvsn
1094
+ @: $(MAKE); $(unstage)
1095
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1096
+ r=`${PWD_COMMAND}`; export r; \
1097
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1099
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1100
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1102
+ echo "Doing clean in libgnatvsn" ; \
1103
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1104
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1105
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1106
+ "RANLIB=$${RANLIB}" \
1107
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1113
+.PHONY: maybe-distclean-libgnatvsn distclean-libgnatvsn
1114
+maybe-distclean-libgnatvsn:
1116
+maybe-distclean-libgnatvsn: distclean-libgnatvsn
1118
+distclean-libgnatvsn:
1119
+ @: $(MAKE); $(unstage)
1120
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1121
+ r=`${PWD_COMMAND}`; export r; \
1122
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1124
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1125
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1127
+ echo "Doing distclean in libgnatvsn" ; \
1128
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1129
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1130
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1131
+ "RANLIB=$${RANLIB}" \
1132
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1138
+.PHONY: maybe-maintainer-clean-libgnatvsn maintainer-clean-libgnatvsn
1139
+maybe-maintainer-clean-libgnatvsn:
1141
+maybe-maintainer-clean-libgnatvsn: maintainer-clean-libgnatvsn
1143
+maintainer-clean-libgnatvsn:
1144
+ @: $(MAKE); $(unstage)
1145
+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \
1146
+ r=`${PWD_COMMAND}`; export r; \
1147
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1149
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1150
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1152
+ echo "Doing maintainer-clean in libgnatvsn" ; \
1153
+ (cd $(HOST_SUBDIR)/libgnatvsn && \
1154
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1155
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1156
+ "RANLIB=$${RANLIB}" \
1157
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1158
+ maintainer-clean) \
1165
.PHONY: configure-gnattools maybe-configure-gnattools
1166
maybe-configure-gnattools:
1168
@@ -57263,6 +57637,361 @@
1172
+.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
1173
+maybe-configure-target-libgnatvsn:
1175
+configure-target-libgnatvsn: stage_current
1176
+@endif gcc-bootstrap
1177
+@if target-libgnatvsn
1178
+maybe-configure-target-libgnatvsn: configure-target-libgnatvsn
1179
+configure-target-libgnatvsn:
1180
+ @: $(MAKE); $(unstage)
1181
+ @r=`${PWD_COMMAND}`; export r; \
1182
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1183
+ echo "Checking multilib configuration for libgnatvsn..."; \
1184
+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
1185
+ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp 2> /dev/null ; \
1186
+ if test -r $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
1187
+ if cmp -s $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
1188
+ rm -f $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp; \
1190
+ rm -f $(TARGET_SUBDIR)/libgnatvsn/Makefile; \
1191
+ mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
1194
+ mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
1196
+ test ! -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || exit 0; \
1197
+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
1198
+ $(NORMAL_TARGET_EXPORTS) \
1199
+ echo Configuring in $(TARGET_SUBDIR)/libgnatvsn; \
1200
+ cd "$(TARGET_SUBDIR)/libgnatvsn" || exit 1; \
1201
+ case $(srcdir) in \
1202
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
1203
+ *) topdir=`echo $(TARGET_SUBDIR)/libgnatvsn/ | \
1204
+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
1206
+ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
1207
+ libsrcdir="$$s/libgnatvsn"; \
1208
+ rm -f no-such-file || : ; \
1209
+ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
1210
+ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
1211
+ --target=${target_alias} $${srcdiroption} \
1213
+@endif target-libgnatvsn
1219
+.PHONY: all-target-libgnatvsn maybe-all-target-libgnatvsn
1220
+maybe-all-target-libgnatvsn:
1222
+all-target-libgnatvsn: stage_current
1223
+@endif gcc-bootstrap
1224
+@if target-libgnatvsn
1225
+TARGET-target-libgnatvsn=all
1226
+maybe-all-target-libgnatvsn: all-target-libgnatvsn
1227
+all-target-libgnatvsn: configure-target-libgnatvsn
1228
+ @: $(MAKE); $(unstage)
1229
+ @r=`${PWD_COMMAND}`; export r; \
1230
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1231
+ $(NORMAL_TARGET_EXPORTS) \
1232
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1233
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
1234
+ $(TARGET-target-libgnatvsn))
1235
+@endif target-libgnatvsn
1241
+.PHONY: check-target-libgnatvsn maybe-check-target-libgnatvsn
1242
+maybe-check-target-libgnatvsn:
1243
+@if target-libgnatvsn
1244
+maybe-check-target-libgnatvsn: check-target-libgnatvsn
1246
+# Dummy target for uncheckable module.
1247
+check-target-libgnatvsn:
1249
+@endif target-libgnatvsn
1251
+.PHONY: install-target-libgnatvsn maybe-install-target-libgnatvsn
1252
+maybe-install-target-libgnatvsn:
1253
+@if target-libgnatvsn
1254
+maybe-install-target-libgnatvsn: install-target-libgnatvsn
1256
+install-target-libgnatvsn: installdirs
1257
+ @: $(MAKE); $(unstage)
1258
+ @r=`${PWD_COMMAND}`; export r; \
1259
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1260
+ $(NORMAL_TARGET_EXPORTS) \
1261
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1262
+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
1264
+@endif target-libgnatvsn
1266
+.PHONY: install-strip-target-libgnatvsn maybe-install-strip-target-libgnatvsn
1267
+maybe-install-strip-target-libgnatvsn:
1268
+@if target-libgnatvsn
1269
+maybe-install-strip-target-libgnatvsn: install-strip-target-libgnatvsn
1271
+install-strip-target-libgnatvsn: installdirs
1272
+ @: $(MAKE); $(unstage)
1273
+ @r=`${PWD_COMMAND}`; export r; \
1274
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1275
+ $(NORMAL_TARGET_EXPORTS) \
1276
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1277
+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
1279
+@endif target-libgnatvsn
1281
+# Other targets (info, dvi, pdf, etc.)
1283
+.PHONY: maybe-info-target-libgnatvsn info-target-libgnatvsn
1284
+maybe-info-target-libgnatvsn:
1285
+@if target-libgnatvsn
1286
+maybe-info-target-libgnatvsn: info-target-libgnatvsn
1288
+# libgnatvsn doesn't support info.
1289
+info-target-libgnatvsn:
1291
+@endif target-libgnatvsn
1293
+.PHONY: maybe-dvi-target-libgnatvsn dvi-target-libgnatvsn
1294
+maybe-dvi-target-libgnatvsn:
1295
+@if target-libgnatvsn
1296
+maybe-dvi-target-libgnatvsn: dvi-target-libgnatvsn
1298
+# libgnatvsn doesn't support dvi.
1299
+dvi-target-libgnatvsn:
1301
+@endif target-libgnatvsn
1303
+.PHONY: maybe-pdf-target-libgnatvsn pdf-target-libgnatvsn
1304
+maybe-pdf-target-libgnatvsn:
1305
+@if target-libgnatvsn
1306
+maybe-pdf-target-libgnatvsn: pdf-target-libgnatvsn
1308
+pdf-target-libgnatvsn: \
1309
+ configure-target-libgnatvsn
1310
+ @: $(MAKE); $(unstage)
1311
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1312
+ r=`${PWD_COMMAND}`; export r; \
1313
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1314
+ $(NORMAL_TARGET_EXPORTS) \
1315
+ echo "Doing pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \
1316
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1317
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1319
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1320
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1321
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1322
+ "RANLIB=$${RANLIB}" \
1323
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1327
+@endif target-libgnatvsn
1329
+.PHONY: maybe-html-target-libgnatvsn html-target-libgnatvsn
1330
+maybe-html-target-libgnatvsn:
1331
+@if target-libgnatvsn
1332
+maybe-html-target-libgnatvsn: html-target-libgnatvsn
1334
+# libgnatvsn doesn't support html.
1335
+html-target-libgnatvsn:
1337
+@endif target-libgnatvsn
1339
+.PHONY: maybe-TAGS-target-libgnatvsn TAGS-target-libgnatvsn
1340
+maybe-TAGS-target-libgnatvsn:
1341
+@if target-libgnatvsn
1342
+maybe-TAGS-target-libgnatvsn: TAGS-target-libgnatvsn
1344
+# libgnatvsn doesn't support TAGS.
1345
+TAGS-target-libgnatvsn:
1347
+@endif target-libgnatvsn
1349
+.PHONY: maybe-install-info-target-libgnatvsn install-info-target-libgnatvsn
1350
+maybe-install-info-target-libgnatvsn:
1351
+@if target-libgnatvsn
1352
+maybe-install-info-target-libgnatvsn: install-info-target-libgnatvsn
1354
+# libgnatvsn doesn't support install-info.
1355
+install-info-target-libgnatvsn:
1357
+@endif target-libgnatvsn
1359
+.PHONY: maybe-install-pdf-target-libgnatvsn install-pdf-target-libgnatvsn
1360
+maybe-install-pdf-target-libgnatvsn:
1361
+@if target-libgnatvsn
1362
+maybe-install-pdf-target-libgnatvsn: install-pdf-target-libgnatvsn
1364
+install-pdf-target-libgnatvsn: \
1365
+ configure-target-libgnatvsn \
1366
+ pdf-target-libgnatvsn
1367
+ @: $(MAKE); $(unstage)
1368
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1369
+ r=`${PWD_COMMAND}`; export r; \
1370
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1371
+ $(NORMAL_TARGET_EXPORTS) \
1372
+ echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \
1373
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1374
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1376
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1377
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1378
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1379
+ "RANLIB=$${RANLIB}" \
1380
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1384
+@endif target-libgnatvsn
1386
+.PHONY: maybe-install-html-target-libgnatvsn install-html-target-libgnatvsn
1387
+maybe-install-html-target-libgnatvsn:
1388
+@if target-libgnatvsn
1389
+maybe-install-html-target-libgnatvsn: install-html-target-libgnatvsn
1391
+install-html-target-libgnatvsn: \
1392
+ configure-target-libgnatvsn \
1393
+ html-target-libgnatvsn
1394
+ @: $(MAKE); $(unstage)
1395
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1396
+ r=`${PWD_COMMAND}`; export r; \
1397
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1398
+ $(NORMAL_TARGET_EXPORTS) \
1399
+ echo "Doing install-html in $(TARGET_SUBDIR)/libgnatvsn" ; \
1400
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1401
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1403
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1404
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1405
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1406
+ "RANLIB=$${RANLIB}" \
1407
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1411
+@endif target-libgnatvsn
1413
+.PHONY: maybe-installcheck-target-libgnatvsn installcheck-target-libgnatvsn
1414
+maybe-installcheck-target-libgnatvsn:
1415
+@if target-libgnatvsn
1416
+maybe-installcheck-target-libgnatvsn: installcheck-target-libgnatvsn
1418
+# libgnatvsn doesn't support installcheck.
1419
+installcheck-target-libgnatvsn:
1421
+@endif target-libgnatvsn
1423
+.PHONY: maybe-mostlyclean-target-libgnatvsn mostlyclean-target-libgnatvsn
1424
+maybe-mostlyclean-target-libgnatvsn:
1425
+@if target-libgnatvsn
1426
+maybe-mostlyclean-target-libgnatvsn: mostlyclean-target-libgnatvsn
1428
+mostlyclean-target-libgnatvsn:
1429
+ @: $(MAKE); $(unstage)
1430
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1431
+ r=`${PWD_COMMAND}`; export r; \
1432
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1433
+ $(NORMAL_TARGET_EXPORTS) \
1434
+ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
1435
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1436
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1438
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1439
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1440
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1441
+ "RANLIB=$${RANLIB}" \
1442
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1446
+@endif target-libgnatvsn
1448
+.PHONY: maybe-clean-target-libgnatvsn clean-target-libgnatvsn
1449
+maybe-clean-target-libgnatvsn:
1450
+@if target-libgnatvsn
1451
+maybe-clean-target-libgnatvsn: clean-target-libgnatvsn
1453
+clean-target-libgnatvsn:
1454
+ @: $(MAKE); $(unstage)
1455
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1456
+ r=`${PWD_COMMAND}`; export r; \
1457
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1458
+ $(NORMAL_TARGET_EXPORTS) \
1459
+ echo "Doing clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
1460
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1461
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1463
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1464
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1465
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1466
+ "RANLIB=$${RANLIB}" \
1467
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1471
+@endif target-libgnatvsn
1473
+.PHONY: maybe-distclean-target-libgnatvsn distclean-target-libgnatvsn
1474
+maybe-distclean-target-libgnatvsn:
1475
+@if target-libgnatvsn
1476
+maybe-distclean-target-libgnatvsn: distclean-target-libgnatvsn
1478
+distclean-target-libgnatvsn:
1479
+ @: $(MAKE); $(unstage)
1480
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1481
+ r=`${PWD_COMMAND}`; export r; \
1482
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1483
+ $(NORMAL_TARGET_EXPORTS) \
1484
+ echo "Doing distclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
1485
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1486
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1488
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1489
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1490
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1491
+ "RANLIB=$${RANLIB}" \
1492
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1496
+@endif target-libgnatvsn
1498
+.PHONY: maybe-maintainer-clean-target-libgnatvsn maintainer-clean-target-libgnatvsn
1499
+maybe-maintainer-clean-target-libgnatvsn:
1500
+@if target-libgnatvsn
1501
+maybe-maintainer-clean-target-libgnatvsn: maintainer-clean-target-libgnatvsn
1503
+maintainer-clean-target-libgnatvsn:
1504
+ @: $(MAKE); $(unstage)
1505
+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
1506
+ r=`${PWD_COMMAND}`; export r; \
1507
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1508
+ $(NORMAL_TARGET_EXPORTS) \
1509
+ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
1510
+ for flag in $(EXTRA_TARGET_FLAGS); do \
1511
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1513
+ (cd $(TARGET_SUBDIR)/libgnatvsn && \
1514
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1515
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1516
+ "RANLIB=$${RANLIB}" \
1517
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1518
+ maintainer-clean) \
1521
+@endif target-libgnatvsn
1527
.PHONY: configure-target-libgomp maybe-configure-target-libgomp
1528
maybe-configure-target-libgomp:
1530
@@ -60326,6 +61055,7 @@
1531
configure-target-qthreads: stage_last
1532
configure-target-rda: stage_last
1533
configure-target-libada: stage_last
1534
+configure-target-libgnatvsn: stage_last
1535
configure-stage1-target-libgomp: maybe-all-stage1-gcc
1536
configure-stage2-target-libgomp: maybe-all-stage2-gcc
1537
configure-stage3-target-libgomp: maybe-all-stage3-gcc
1538
@@ -60357,6 +61087,7 @@
1539
configure-target-qthreads: maybe-all-gcc
1540
configure-target-rda: maybe-all-gcc
1541
configure-target-libada: maybe-all-gcc
1542
+configure-target-libgnatvsn: maybe-all-gcc
1543
configure-target-libgomp: maybe-all-gcc
1544
@endif gcc-no-bootstrap
1546
@@ -60657,6 +61388,8 @@
1547
all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
1548
all-fixincludes: maybe-all-libiberty
1549
all-gnattools: maybe-all-libada
1550
+all-gnattools: maybe-all-libgnatvsn
1551
+all-libgnatvsn: maybe-all-libada
1552
all-lto-plugin: maybe-all-libiberty
1554
all-stage1-lto-plugin: maybe-all-stage1-libiberty
1555
@@ -61201,6 +61934,7 @@
1556
configure-target-qthreads: maybe-all-target-libgcc
1557
configure-target-rda: maybe-all-target-libgcc
1558
configure-target-libada: maybe-all-target-libgcc
1559
+configure-target-libgnatvsn: maybe-all-target-libgcc
1560
configure-target-libgomp: maybe-all-target-libgcc
1561
@endif gcc-no-bootstrap
1563
@@ -61247,6 +61981,8 @@
1565
configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
1567
+configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
1569
configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
1572
Index: b/src/configure.ac
1573
===================================================================
1574
--- a/src/configure.ac
1575
+++ b/src/configure.ac
1578
# these libraries are used by various programs built for the host environment
1580
-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv libada"
1581
+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr mpc ppl cloog libelf libiconv libada libgnatvsn"
1583
# these tools are built for the host environment
1584
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
1589
+ target-libgnatvsn \
1592
# these tools are built using the target libraries, and are intended to
1595
# Similarly, some are only suitable for cross toolchains.
1596
# Remove these if host=target.
1597
-cross_only="target-libgloss target-newlib target-opcodes target-libada"
1598
+cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
1600
case $is_cross_compiler in
1601
no) skipdirs="${skipdirs} ${cross_only}" ;;
1603
ENABLE_LIBADA=$enableval,
1605
if test "${ENABLE_LIBADA}" != "yes" ; then
1606
- noconfigdirs="$noconfigdirs gnattools"
1607
+ noconfigdirs="$noconfigdirs libgnatvsn gnattools"
1610
AC_ARG_ENABLE(libssp,
1611
Index: b/src/gcc/ada/gcc-interface/config-lang.in
1612
===================================================================
1613
--- a/src/gcc/ada/gcc-interface/config-lang.in
1614
+++ b/src/gcc/ada/gcc-interface/config-lang.in
1617
outputs="ada/gcc-interface/Makefile ada/Makefile"
1619
-target_libs="target-libada"
1620
-lang_dirs="libada gnattools"
1621
+target_libs="target-libada target-libgnatvsn"
1622
+lang_dirs="libada libgnatvsn gnattools"
1624
# Ada is not enabled by default for the time being.
added
removed
.svn/pristine/3a/3a7df7ce497bc26eb44308b0dd1b9427f1ff6cc0.svn-base
