1
# DP: - Install the shared Ada libraries as '.so.1', not '.so' to conform
2
# DP: to the Debian policy.
3
# DP: - Don't include a runtime link path (-rpath), when linking binaries.
4
# DP: - Build the shared libraries on hppa-linux.
5
# DP: - Instead of building libada as a target library only, build it as
6
# DP: both a host and, if different, target library.
7
# DP: - Build the GNAT tools in their top-level directory; do not use
8
# DP: recursive makefiles.
9
# DP: - Link the GNAT tools dynamically.
11
# This patch seems large, but the hunks in Makefile.in are actually
12
# generated from Makefile.def using autogen.
14
Index: b/src/gcc/ada/gcc-interface/config-lang.in
15
===================================================================
16
--- a/src/gcc/ada/gcc-interface/config-lang.in
17
+++ b/src/gcc/ada/gcc-interface/config-lang.in
19
outputs="ada/gcc-interface/Makefile ada/Makefile"
21
target_libs="target-libada"
22
-lang_dirs="gnattools"
23
+lang_dirs="libada gnattools"
25
# Ada is not enabled by default for the time being.
27
Index: b/src/gcc/ada/link.c
28
===================================================================
29
--- a/src/gcc/ada/link.c
30
+++ b/src/gcc/ada/link.c
33
#elif defined (__FreeBSD__)
34
const char *__gnat_object_file_option = "-Wl,@";
35
-const char *__gnat_run_path_option = "-Wl,-rpath,";
36
-char __gnat_shared_libgnat_default = STATIC;
37
-char __gnat_shared_libgcc_default = STATIC;
38
+const char *__gnat_run_path_option = "";
39
+char __gnat_shared_libgnat_default = SHARED;
40
+char __gnat_shared_libgcc_default = SHARED;
41
int __gnat_link_max = 8192;
42
unsigned char __gnat_objlist_file_supported = 1;
43
const char *__gnat_object_library_extension = ".a";
46
#elif defined (linux) || defined(__GLIBC__)
47
const char *__gnat_object_file_option = "-Wl,@";
48
-const char *__gnat_run_path_option = "-Wl,-rpath,";
49
-char __gnat_shared_libgnat_default = STATIC;
50
-char __gnat_shared_libgcc_default = STATIC;
51
+const char *__gnat_run_path_option = "";
52
+char __gnat_shared_libgnat_default = SHARED;
53
+char __gnat_shared_libgcc_default = SHARED;
54
int __gnat_link_max = 8192;
55
unsigned char __gnat_objlist_file_supported = 1;
56
const char *__gnat_object_library_extension = ".a";
57
Index: b/src/gcc/ada/gcc-interface/Makefile.in
58
===================================================================
59
--- a/src/gcc/ada/gcc-interface/Makefile.in
60
+++ b/src/gcc/ada/gcc-interface/Makefile.in
65
-GNATBIND_FLAGS = -static -x
66
+GNATBIND_FLAGS = -shared -x
68
ADAFLAGS = -W -Wall -gnatpg -gnata
69
FORCE_DEBUG_ADAFLAGS = -g
71
LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBBACKTRACE) $(LIBIBERTY)
72
# Default is no TGT_LIB; one might be passed down or something
74
-TOOLS_LIBS = targext.o link.o ../../ggc-none.o ../../libcommon-target.a \
75
- ../../libcommon.a ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \
76
- ../../../libbacktrace/.libs/libbacktrace.a ../../../libiberty/libiberty.a \
77
- $(SYSLIBS) $(TGT_LIB)
79
# Convert the target variable into a space separated list of architecture,
80
# manufacturer, and operating system and assign each of those to its own
82
# defined in this file into the environment.
85
-# Lists of files for various purposes.
87
-GNATLINK_OBJS = gnatlink.o \
88
- a-except.o ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o \
89
- gnatvsn.o hostparm.o indepsw.o interfac.o i-c.o i-cstrin.o namet.o opt.o \
90
- osint.o output.o rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \
91
- sdefault.o snames.o stylesw.o switch.o system.o table.o targparm.o tree_io.o \
92
- types.o validsw.o widechar.o
94
-GNATMAKE_OBJS = a-except.o ali.o ali-util.o aspects.o s-casuti.o alloc.o \
95
- atree.o binderr.o butil.o casing.o csets.o debug.o elists.o einfo.o errout.o \
96
- erroutc.o errutil.o err_vars.o fmap.o fname.o fname-uf.o fname-sf.o \
97
- gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o \
98
- make.o makeusg.o makeutl.o mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o \
99
- mlib-tgt-specific.o mlib-utl.o namet.o nlists.o opt.o osint.o osint-m.o \
100
- output.o prj.o prj-attr.o prj-attr-pm.o prj-com.o prj-dect.o prj-env.o \
101
- prj-conf.o prj-pp.o prj-err.o prj-ext.o prj-nmsc.o prj-pars.o prj-part.o \
102
- prj-proc.o prj-strt.o prj-tree.o prj-util.o restrict.o rident.o s-exctab.o \
103
- s-secsta.o s-stalib.o s-stoele.o scans.o scng.o sdefault.o sfn_scan.o \
104
- s-purexc.o s-htable.o scil_ll.o sem_aux.o sinfo.o sinput.o sinput-c.o \
105
- sinput-p.o snames.o stand.o stringt.o styleg.o stylesw.o system.o validsw.o \
106
- switch.o switch-m.o table.o targparm.o tempdir.o tree_io.o types.o uintp.o \
107
- uname.o urealp.o usage.o widechar.o \
108
- $(EXTRA_GNATMAKE_OBJS)
110
# Make arch match the current multilib so that the RTS selection code
111
# picks up the right files. For a given target this must be coherent
112
@@ -1376,6 +1348,11 @@
113
LIBRARY_VERSION := $(LIB_VERSION)
116
+ifeq ($(strip $(filter-out hppa% unknown linux gnu,$(targ))),)
117
+ GNATLIB_SHARED = gnatlib-shared-dual
118
+ LIBRARY_VERSION := $(LIB_VERSION)
122
ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
123
LIBGNAT_TARGET_PAIRS = \
124
@@ -2381,151 +2358,6 @@
125
$(patsubst %$(objext),%.adb,$(GNATRTL_OBJS)), \
128
-LIBGNAT=../$(RTSDIR)/libgnat.a
130
-TOOLS_FLAGS_TO_PASS= \
132
- "CFLAGS=$(CFLAGS)" \
133
- "LDFLAGS=$(LDFLAGS)" \
134
- "ADAFLAGS=$(ADAFLAGS)" \
135
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)"\
136
- "ADA_INCLUDES=$(ADA_INCLUDES) $(ADA_INCLUDES_FOR_SUBDIR)"\
137
- "libsubdir=$(libsubdir)" \
138
- "exeext=$(exeext)" \
139
- "fsrcdir=$(fsrcdir)" \
140
- "srcdir=$(fsrcdir)" \
141
- "TOOLS_LIBS=$(TOOLS_LIBS) $(TGT_LIB)" \
142
- "GNATMAKE=$(GNATMAKE)" \
143
- "GNATLINK=$(GNATLINK)" \
144
- "GNATBIND=$(GNATBIND)"
146
-GCC_LINK=$(CC) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
148
-# Build directory for the tools. Let's copy the target-dependent
149
-# sources using the same mechanism as for gnatlib. The other sources are
150
-# accessed using the vpath directive below
151
-# Note: dummy target, stamp-tools is mainly handled by gnattools.
154
- touch ../stamp-tools
156
-# when compiling the tools, the runtime has to be first on the path so that
157
-# it hides the runtime files lying with the rest of the sources
158
-ifeq ($(TOOLSCASE),native)
159
- vpath %.ads ../$(RTSDIR) ../
160
- vpath %.adb ../$(RTSDIR) ../
161
- vpath %.c ../$(RTSDIR) ../
162
- vpath %.h ../$(RTSDIR) ../
165
-# in the cross tools case, everything is compiled with the native
166
-# gnatmake/link. Therefore only -I needs to be modified in ADA_INCLUDES
167
-ifeq ($(TOOLSCASE),cross)
174
-# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap
175
-# reasons: gnatmake should be built with a recent compiler, a recent compiler
176
-# may not generate ALI files compatible with an old gnatmake so it is important
177
-# to be able to build gnatmake without a version of gnatmake around. Once
178
-# everything has been compiled once, gnatmake can be recompiled with itself
179
-# (see target gnattools1-re)
180
-gnattools1: ../stamp-tools ../stamp-gnatlib-$(RTSDIR)
181
- $(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
183
- ../../gnatmake$(exeext) ../../gnatlink$(exeext)
185
-# gnatmake/link can be built with recent gnatmake/link if they are available.
186
-# This is especially convenient for building cross tools or for rebuilding
187
-# the tools when the original bootstrap has already be done.
188
-gnattools1-re: ../stamp-tools
189
- $(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
190
- TOOLSCASE=cross INCLUDES="" gnatmake-re gnatlink-re
192
-# these tools are built with gnatmake & are common to native and cross
193
-gnattools2: ../stamp-tools
194
- $(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
195
- TOOLSCASE=native common-tools $(EXTRA_GNATTOOLS)
197
-# those tools are only built for the cross version
198
-gnattools4: ../stamp-tools
199
-ifeq ($(ENABLE_VXADDR2LINE),true)
200
- $(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
201
- TOOLSCASE=cross top_buildir=../../.. \
202
- ../../vxaddr2line$(exeext)
205
-common-tools: ../stamp-tools
206
- $(GNATMAKE) -j0 -c -b $(ADA_INCLUDES) \
207
- --GNATBIND="$(GNATBIND)" --GCC="$(CC) $(ALL_ADAFLAGS)" \
208
- gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
209
- gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
210
- $(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
211
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
212
- $(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
213
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
214
- $(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
215
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
216
- $(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
217
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
218
- $(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
219
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
220
- $(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
221
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
222
- $(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
223
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
224
- $(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
225
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
226
- $(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
227
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
229
-../../gnatsym$(exeext): ../stamp-tools
230
- $(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
231
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatsym
232
- $(GNATLINK) -v gnatsym -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
234
-../../gnatdll$(exeext): ../stamp-tools
235
- $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
236
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatdll
237
- $(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
239
-../../vxaddr2line$(exeext): ../stamp-tools targext.o
240
- $(GNATMAKE) -c $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
241
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line
242
- $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" targext.o $(CLIB)
244
-gnatmake-re: ../stamp-tools link.o targext.o
245
- $(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
246
- $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
247
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake
248
- $(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
249
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
251
-# Note the use of the "mv" command in order to allow gnatlink to be linked with
252
-# with the former version of gnatlink itself which cannot override itself.
253
-# gnatlink-re cannot be run at the same time as gnatmake-re, hence the
255
-gnatlink-re: ../stamp-tools link.o targext.o gnatmake-re
256
- $(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
257
- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
258
- $(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
259
- --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
260
- $(MV) ../../gnatlinknew$(exeext) ../../gnatlink$(exeext)
262
-# Needs to be built with CC=gcc
263
-# Since the RTL should be built with the latest compiler, remove the
264
-# stamp target in the parent directory whenever gnat1 is rebuilt
266
-# Likewise for the tools
267
-../../gnatmake$(exeext): $(P) b_gnatm.o link.o targext.o $(GNATMAKE_OBJS)
268
- +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS)
270
-../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS)
271
- +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
273
../stamp-gnatlib-$(RTSDIR):
274
@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
276
@@ -2562,14 +2394,10 @@
277
# Also install the .dSYM directories if they exist (these directories
278
# contain the debug information for the shared libraries on darwin)
279
for file in gnat gnarl; do \
280
- if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
281
- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
282
+ if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
283
+ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
284
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
286
- if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
287
- $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
288
- $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
290
if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
291
$(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
292
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
293
@@ -2582,19 +2410,7 @@
294
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
295
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
297
-../stamp-gnatlib2-$(RTSDIR):
298
- $(RM) $(RTSDIR)/s-*.ali
299
- $(RM) $(RTSDIR)/s-*$(objext)
300
- $(RM) $(RTSDIR)/a-*.ali
301
- $(RM) $(RTSDIR)/a-*$(objext)
302
- $(RM) $(RTSDIR)/*.ali
303
- $(RM) $(RTSDIR)/*$(objext)
304
- $(RM) $(RTSDIR)/*$(arext)
305
- $(RM) $(RTSDIR)/*$(soext)
306
- touch ../stamp-gnatlib2-$(RTSDIR)
307
- $(RM) ../stamp-gnatlib-$(RTSDIR)
309
-../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
310
+../stamp-gnatlib1-$(RTSDIR): Makefile
313
$(CHMOD) u+w $(RTSDIR)
314
@@ -2659,7 +2475,7 @@
315
# Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS)
316
# is guaranteed to overflow the buffer.
318
-gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
319
+gnatlib: ../stamp-gnatlib1-$(RTSDIR) $(RTSDIR)/s-oscons.ads
321
$(MAKE) -C $(RTSDIR) \
322
CC="`echo \"$(GCC_FOR_TARGET)\" \
323
@@ -2696,32 +2512,47 @@
325
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
326
gnatlib-shared-default:
327
- $(MAKE) $(FLAGS_TO_PASS) \
328
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
329
- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
330
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
331
- MULTISUBDIR="$(MULTISUBDIR)" \
332
- THREAD_KIND="$(THREAD_KIND)" \
334
- $(RM) $(RTSDIR)/libgna*$(soext)
335
+ $(MAKE) -C $(RTSDIR) \
336
+ CC="`echo \"$(GCC_FOR_TARGET)\" \
337
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
338
+ INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
339
+ CFLAGS="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
340
+ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
341
+ srcdir=$(fsrcdir) \
342
+ -f ../Makefile $(LIBGNAT_OBJS)
343
+ $(MAKE) -C $(RTSDIR) \
344
+ CC="`echo \"$(GCC_FOR_TARGET)\" \
345
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
347
+ CFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
348
+ ADAFLAGS="$(GNATLIBFLAGS) $(PICFLAG_FOR_TARGET)" \
349
+ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
350
+ srcdir=$(fsrcdir) \
353
+ $(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
354
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
355
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
356
$(PICFLAG_FOR_TARGET) \
357
- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
358
+ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
359
$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
360
- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
361
+ $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
363
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
364
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
365
$(PICFLAG_FOR_TARGET) \
366
- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
367
+ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
368
$(GNATRTL_TASKING_OBJS) \
369
- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
370
+ $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
372
- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
374
- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
376
+ cd $(RTSDIR); for lib in gnat gnarl; do \
377
+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
378
+ $(LN_S) $$l.1 $$l; \
380
+# Delete the object files, lest they be linked statically into the tools
381
+# executables. Only the .ali, .a and .so files must remain.
382
+ rm -f $(RTSDIR)/*.o
383
+ $(CHMOD) a-wx $(RTSDIR)/*.ali
386
$(MAKE) $(FLAGS_TO_PASS) \
387
@@ -2730,17 +2561,15 @@
388
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
389
MULTISUBDIR="$(MULTISUBDIR)" \
390
THREAD_KIND="$(THREAD_KIND)" \
391
- gnatlib-shared-default
392
- $(MV) $(RTSDIR)/libgna*$(soext) .
393
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
395
+ $(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
396
$(MAKE) $(FLAGS_TO_PASS) \
397
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
398
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
399
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
400
MULTISUBDIR="$(MULTISUBDIR)" \
401
THREAD_KIND="$(THREAD_KIND)" \
403
- $(MV) libgna*$(soext) $(RTSDIR)
404
+ gnatlib-shared-default
406
gnatlib-shared-dual-win32:
407
$(MAKE) $(FLAGS_TO_PASS) \
408
@@ -2750,17 +2579,15 @@
409
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
410
MULTISUBDIR="$(MULTISUBDIR)" \
411
THREAD_KIND="$(THREAD_KIND)" \
412
- gnatlib-shared-win32
413
- $(MV) $(RTSDIR)/libgna*$(soext) .
414
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
416
+ $(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
417
$(MAKE) $(FLAGS_TO_PASS) \
418
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
419
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
420
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
421
MULTISUBDIR="$(MULTISUBDIR)" \
422
THREAD_KIND="$(THREAD_KIND)" \
424
- $(MV) libgna*$(soext) $(RTSDIR)
425
+ gnatlib-shared-win32
427
# ??? we need to add the option to support auto-import of arrays/records to
428
# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
429
@@ -2898,28 +2725,6 @@
430
THREAD_KIND="$(THREAD_KIND)" \
431
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib
433
-# Compiling object files from source files.
435
-# Note that dependencies on obstack.h are not written
436
-# because that file is not part of GCC.
437
-# Dependencies on gvarargs.h are not written
438
-# because all that file does, when not compiling with GCC,
439
-# is include the system varargs.h.
441
-b_gnatl.adb : $(GNATLINK_OBJS)
442
- $(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.adb gnatlink.ali
444
-b_gnatl.o : b_gnatl.adb
445
- $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN \
446
- $< $(OUTPUT_OPTION)
448
-b_gnatm.adb : $(GNATMAKE_OBJS)
449
- $(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.adb gnatmake.ali
451
-b_gnatm.o : b_gnatm.adb
452
- $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN \
453
- $< $(OUTPUT_OPTION)
455
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
456
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
458
Index: b/src/gnattools/Makefile.in
459
===================================================================
460
--- a/src/gnattools/Makefile.in
461
+++ b/src/gnattools/Makefile.in
463
# Default target; must be first.
466
+.NOTPARALLEL: # don't run multiple gnatmakes in parallel in the same directory
469
# Standard autoconf-set variables.
474
target_noncanonical=@target_noncanonical@
476
-# Variables for the user (or the top level) to override.
483
-PWD_COMMAND = $${PWDCMD-pwd}
485
-# The tedious process of getting CFLAGS right.
487
-GCC_WARN_CFLAGS = -W -Wall
488
-WARN_CFLAGS = @warn_cflags@
490
-ADA_CFLAGS=@ADA_CFLAGS@
492
-# Variables for gnattools.
493
-ADAFLAGS= -gnatpg -gnata
495
-# For finding the GCC build dir, which is used far too much
498
-# Absolute srcdir for gcc (why do we want absolute? I dunno)
499
-fsrcdir := $(shell cd $(srcdir)/../gcc/; ${PWD_COMMAND})
501
-# Useful "subroutines" for the excess includes
502
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \
503
- -I$(fsrcdir)/../include -I$(fsrcdir)
504
-ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
506
-# Variables for gnattools, native
507
-TOOLS_FLAGS_TO_PASS_NATIVE= \
508
- "CC=../../xgcc -B../../" \
509
- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
510
- "LDFLAGS=$(LDFLAGS)" \
511
- "ADAFLAGS=$(ADAFLAGS)" \
512
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
513
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
514
- "ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
515
- "exeext=$(exeext)" \
516
- "fsrcdir=$(fsrcdir)" \
517
- "srcdir=$(fsrcdir)" \
518
- "GNATMAKE=../../gnatmake" \
519
- "GNATLINK=../../gnatlink" \
520
- "GNATBIND=../../gnatbind" \
523
-# Variables for regnattools
524
-TOOLS_FLAGS_TO_PASS_RE= \
525
- "CC=../../xgcc -B../../" \
526
- "CFLAGS=$(CFLAGS)" \
527
- "LDFLAGS=$(LDFLAGS)" \
528
- "ADAFLAGS=$(ADAFLAGS)" \
529
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
530
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
531
- "ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
532
- "exeext=$(exeext)" \
533
- "fsrcdir=$(fsrcdir)" \
534
- "srcdir=$(fsrcdir)" \
535
- "GNATMAKE=../../gnatmake" \
536
- "GNATLINK=../../gnatlink" \
537
- "GNATBIND=../../gnatbind" \
540
-# Variables for gnattools, cross
541
-ifeq ($(build), $(host))
542
- GNATMAKE_FOR_HOST=gnatmake
543
- GNATLINK_FOR_HOST=gnatlink
544
- GNATBIND_FOR_HOST=gnatbind
545
- GNATLS_FOR_HOST=gnatls
547
- GNATMAKE_FOR_HOST=$(host_alias)-gnatmake
548
- GNATLINK_FOR_HOST=$(host_alias)-gnatlink
549
- GNATBIND_FOR_HOST=$(host_alias)-gnatbind
550
- GNATLS_FOR_HOST=$(host_alias)-gnatls
553
-# Put the host RTS dir first in the PATH to hide the default runtime
554
-# files that are among the sources
555
-RTS_DIR:=$(strip $(subst \,/,$(shell $(GNATLS_FOR_HOST) -v | grep adalib )))
557
-TOOLS_FLAGS_TO_PASS_CROSS= \
559
- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
560
- "LDFLAGS=$(LDFLAGS)" \
561
- "ADAFLAGS=$(ADAFLAGS)" \
562
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
563
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
564
- "ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
565
- "exeext=$(exeext)" \
566
- "fsrcdir=$(fsrcdir)" \
567
- "srcdir=$(fsrcdir)" \
568
- "GNATMAKE=$(GNATMAKE_FOR_HOST)" \
569
- "GNATLINK=$(GNATLINK_FOR_HOST)" \
570
- "GNATBIND=$(GNATBIND_FOR_HOST)" \
571
- "TOOLSCASE=cross" \
574
+INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
575
+ADA_CFLAGS=-O2 -gnatn
576
+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
577
+LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
578
+ @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
579
+SHARED_ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
580
+STATIC_ADA_LIBS := ../gcc/ada/rts/libgnat.a
581
+STATIC_GCC_LIBS := ../gcc/libcommon-target.a ../gcc/libcommon.a ../libcpp/libcpp.a \
582
+../libbacktrace/.libs/libbacktrace.a ../libiberty/libiberty.a
584
+# We will use the just-built compiler to compile and link everything.
585
+GCC=../gcc/xgcc -B../gcc/
589
@@ -140,116 +59,228 @@
590
EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
591
TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
593
+# Stage 1 builds xgcc and gnatbind; we can use them to build
594
+# gnatmake-static and gnatlink-static, then use gnatmake-static and
595
+# gnatlink-static to build the other tools. The reason we first build
596
+# statically-linked versions of gnatmake and gnatlink is so we can run
597
+# them with confidence on all build platforms, without LD_LIBRARY_PATH
598
+# or some such variable.
600
+# The tools we will build using gnatmake-static and gnatlink-static.
601
+TOOLS := gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatls gnatlink
602
+TOOLS += gnatmake gnatname gnatprep gnatxref
604
+# Since we don't have gnatmake, we must specify the full list of
605
+# object files necessary to build gnatmake and gnatlink.
606
+# TODO: remove from these lists the objects that are part of
607
+# libgnatvsn and libgnatprj.
669
+mlib-tgt-specific.o \
724
+$(EXTRA_GNATMAKE_OBJS)
729
.PHONY: gnattools gnattools-native gnattools-cross regnattools
730
gnattools: @default_gnattools_target@
733
-$(GCC_DIR)/stamp-gnatlib-rts:
734
- @if [ ! -f $(GCC_DIR)/stamp-gnatlib-rts ] ; \
736
- echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \
743
# Build directory for the tools. Let's copy the target-dependent
744
# sources using the same mechanism as for gnatlib. The other sources are
745
-# accessed using the vpath directive in ada/Makefile.in
746
+# accessed using the vpath directive.
748
+stamp-gnattools-sources:
749
+ $(LN_S) ../gcc/ada/sdefault.adb ../gcc/ada/snames.ads ../gcc/ada/snames.adb .
750
+ $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
751
+ rm -f $(word 1,$(subst <, ,$(PAIR)));\
752
+ $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
753
+ $(word 1,$(subst <, ,$(PAIR)));)
756
+gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
757
+gnattools-native: stamp-gnattools-sources
758
+gnattools-native: $(TOOLS)
760
+$(TOOLS) gnatcmd: | gnatmake-static gnatlink-static
762
+vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
763
+vpath %.h @srcdir@/../gcc/ada
764
+vpath %.adb .:@srcdir@/../gcc/ada
765
+vpath %.ads @srcdir@/../gcc/ada
769
+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
770
+ $(GCC) -o $@ $^ ../gcc/ada/rts/libgnat.a $(STATIC_GCC_LIBS)
772
+gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o
773
+ $(GCC) -o $@ $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS)
775
+b_gnatl.adb: $(GNATLINK_OBJS)
776
+ ../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatlink.ali
780
+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
781
+ $(GCC) -o $@ $(ADA_CFLAGS) $^ $(STATIC_ADA_LIBS) $(STATIC_GCC_LIBS)
783
+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o
784
+ $(GCC) -o $@ $(ADA_CFLAGS) $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS)
786
+b_gnatm.adb: $(GNATMAKE_OBJS)
787
+ ../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatmake.ali
791
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
793
+ --GNATBIND=../gcc/gnatbind
794
+ ./gnatlink-static -o $@ $@.ali $(ADA_INCLUDES) $(SHARED_ADA_LIBS) \
795
+ --GCC="$(GCC) $(ADA_INCLUDES)" $(STATIC_GCC_LIBS)
800
+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref: \
802
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
804
+ --GNATBIND=../gcc/gnatbind
805
+ ./gnatlink-static -o $@ $@.ali $^ \
806
+ $(ADA_INCLUDES) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) \
807
+ --GCC="$(GCC) $(ADA_INCLUDES)"
809
+# Force compiling sdefault.adb, not .ads, to produce sdefault.o
810
+sdefault.o: sdefault.adb
812
+sdefault.adb: stamp-gnattools-sources
814
+# Because these sources don't exist when the Makefile is evaluated:
815
+snames.o: snames.adb snames.ads
817
+snames.adb snames.ads: stamp-gnattools-sources
820
+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
823
+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
825
-$(GCC_DIR)/stamp-tools:
826
- -rm -rf $(GCC_DIR)/ada/tools
827
- -mkdir -p $(GCC_DIR)/ada/tools
828
- -(cd $(GCC_DIR)/ada/tools; $(LN_S) ../sdefault.adb ../snames.ads ../snames.adb .)
829
- -$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
830
- rm -f $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));\
831
- $(LN_S) $(fsrcdir)/ada/$(word 2,$(subst <, ,$(PAIR))) \
832
- $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
833
- touch $(GCC_DIR)/stamp-tools
835
-# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap
836
-# reasons: gnatmake should be built with a recent compiler, a recent compiler
837
-# may not generate ALI files compatible with an old gnatmake so it is important
838
-# to be able to build gnatmake without a version of gnatmake around. Once
839
-# everything has been compiled once, gnatmake can be recompiled with itself
840
-# (see target regnattools)
841
-gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib-rts
843
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
844
- $(TOOLS_FLAGS_TO_PASS_NATIVE) \
845
- ../../gnatmake$(exeext) ../../gnatlink$(exeext)
847
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
848
- $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
850
-# gnatmake/link can be built with recent gnatmake/link if they are available.
851
-# This is especially convenient for building cross tools or for rebuilding
852
-# the tools when the original bootstrap has already be done.
853
-regnattools: $(GCC_DIR)/stamp-gnatlib-rts
855
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
856
- $(TOOLS_FLAGS_TO_PASS_RE) INCLUDES="" \
857
- gnatmake-re gnatlink-re
859
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
860
- $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
862
-gnattools-cross: $(GCC_DIR)/stamp-tools
864
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
865
- $(TOOLS_FLAGS_TO_PASS_CROSS) INCLUDES="" \
866
- gnatmake-re gnatlink-re
868
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
869
- $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools
870
- # Rename cross tools to where the GCC makefile wants them when
871
- # installing. FIXME: installation should be done elsewhere.
872
- if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \
873
- mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \
875
- if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \
876
- mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \
878
- if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \
879
- mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \
881
- if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \
882
- mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \
884
- if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \
885
- mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \
887
- if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \
888
- mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \
890
- if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \
891
- mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \
893
- if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \
894
- mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \
896
- if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \
897
- mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \
899
- if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \
900
- mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \
902
- if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \
903
- mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \
905
- if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \
906
- mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \
908
- if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \
909
- mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \
911
- if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \
912
- mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \
915
+ $(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
921
# Installation rules.
923
+ $(INSTALL) -s gnatmake gnatlink $(TOOLS) $(DESTDIR)$(bindir)
925
install-strip: install
931
+ $(RM) gnatmake gnatlink $(TOOLS) *.o *.ali
934
+ $(RM) *.ads *.adb stamp-gnattools-sources
937
$(RM) Makefile config.status config.log
938
Index: b/src/libada/Makefile.in
939
===================================================================
940
--- a/src/libada/Makefile.in
941
+++ b/src/libada/Makefile.in
943
-fexceptions -DIN_RTS @have_getipinfo@
945
host_subdir = @host_subdir@
946
-GCC_DIR=$(MULTIBUILDTOP)../../$(host_subdir)/gcc
947
+GCC_DIR=$(MULTIBUILDTOP)../$(host_subdir)/gcc
949
target_noncanonical:=@target_noncanonical@
950
version := $(shell cat $(srcdir)/../gcc/BASE-VER)
951
Index: b/src/Makefile.def
952
===================================================================
953
--- a/src/Makefile.def
954
+++ b/src/Makefile.def
957
missing=maintainer-clean; };
958
host_modules= { module= utils; no_check=true; };
959
-host_modules= { module= gnattools; };
960
+host_modules= { module= libada; no_install=true; no_check=true;
965
+ missing= install-info;
966
+ missing= installcheck; };
967
+host_modules= { module= gnattools; no_check=true;
972
+ missing= install-info;
973
+ missing= installcheck; };
974
host_modules= { module= lto-plugin; bootstrap=true;
975
extra_configure_flags=--enable-shared; };
978
target_modules = { module= zlib; };
979
target_modules = { module= boehm-gc; };
980
target_modules = { module= rda; };
981
-target_modules = { module= libada; };
982
+target_modules = { module= libada; no_install=true; no_check=true;
987
+ missing= install-info;
988
+ missing= installcheck; };
989
target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
990
target_modules = { module= libitm; lib_path=.libs; };
991
target_modules = { module= libatomic; lib_path=.libs; };
994
dependencies = { module=all-fixincludes; on=all-libiberty; };
996
-dependencies = { module=all-gnattools; on=all-target-libada; };
997
+dependencies = { module=all-gnattools; on=all-libada; };
999
dependencies = { module=all-lto-plugin; on=all-libiberty; };
1001
Index: b/src/Makefile.in
1002
===================================================================
1003
--- a/src/Makefile.in
1004
+++ b/src/Makefile.in
1006
maybe-configure-tk \
1007
maybe-configure-libtermcap \
1008
maybe-configure-utils \
1009
+ maybe-configure-libada \
1010
maybe-configure-gnattools \
1011
maybe-configure-lto-plugin
1012
.PHONY: configure-target
1013
@@ -1062,6 +1063,7 @@
1014
all-host: maybe-all-tk
1015
all-host: maybe-all-libtermcap
1016
all-host: maybe-all-utils
1017
+all-host: maybe-all-libada
1018
all-host: maybe-all-gnattools
1019
@if lto-plugin-no-bootstrap
1020
all-host: maybe-all-lto-plugin
1021
@@ -1159,6 +1161,7 @@
1022
info-host: maybe-info-tk
1023
info-host: maybe-info-libtermcap
1024
info-host: maybe-info-utils
1025
+info-host: maybe-info-libada
1026
info-host: maybe-info-gnattools
1027
info-host: maybe-info-lto-plugin
1029
@@ -1241,6 +1244,7 @@
1030
dvi-host: maybe-dvi-tk
1031
dvi-host: maybe-dvi-libtermcap
1032
dvi-host: maybe-dvi-utils
1033
+dvi-host: maybe-dvi-libada
1034
dvi-host: maybe-dvi-gnattools
1035
dvi-host: maybe-dvi-lto-plugin
1037
@@ -1323,6 +1327,7 @@
1038
pdf-host: maybe-pdf-tk
1039
pdf-host: maybe-pdf-libtermcap
1040
pdf-host: maybe-pdf-utils
1041
+pdf-host: maybe-pdf-libada
1042
pdf-host: maybe-pdf-gnattools
1043
pdf-host: maybe-pdf-lto-plugin
1045
@@ -1405,6 +1410,7 @@
1046
html-host: maybe-html-tk
1047
html-host: maybe-html-libtermcap
1048
html-host: maybe-html-utils
1049
+html-host: maybe-html-libada
1050
html-host: maybe-html-gnattools
1051
html-host: maybe-html-lto-plugin
1053
@@ -1487,6 +1493,7 @@
1054
TAGS-host: maybe-TAGS-tk
1055
TAGS-host: maybe-TAGS-libtermcap
1056
TAGS-host: maybe-TAGS-utils
1057
+TAGS-host: maybe-TAGS-libada
1058
TAGS-host: maybe-TAGS-gnattools
1059
TAGS-host: maybe-TAGS-lto-plugin
1061
@@ -1569,6 +1576,7 @@
1062
install-info-host: maybe-install-info-tk
1063
install-info-host: maybe-install-info-libtermcap
1064
install-info-host: maybe-install-info-utils
1065
+install-info-host: maybe-install-info-libada
1066
install-info-host: maybe-install-info-gnattools
1067
install-info-host: maybe-install-info-lto-plugin
1069
@@ -1651,6 +1659,7 @@
1070
install-pdf-host: maybe-install-pdf-tk
1071
install-pdf-host: maybe-install-pdf-libtermcap
1072
install-pdf-host: maybe-install-pdf-utils
1073
+install-pdf-host: maybe-install-pdf-libada
1074
install-pdf-host: maybe-install-pdf-gnattools
1075
install-pdf-host: maybe-install-pdf-lto-plugin
1077
@@ -1733,6 +1742,7 @@
1078
install-html-host: maybe-install-html-tk
1079
install-html-host: maybe-install-html-libtermcap
1080
install-html-host: maybe-install-html-utils
1081
+install-html-host: maybe-install-html-libada
1082
install-html-host: maybe-install-html-gnattools
1083
install-html-host: maybe-install-html-lto-plugin
1085
@@ -1815,6 +1825,7 @@
1086
installcheck-host: maybe-installcheck-tk
1087
installcheck-host: maybe-installcheck-libtermcap
1088
installcheck-host: maybe-installcheck-utils
1089
+installcheck-host: maybe-installcheck-libada
1090
installcheck-host: maybe-installcheck-gnattools
1091
installcheck-host: maybe-installcheck-lto-plugin
1093
@@ -1897,6 +1908,7 @@
1094
mostlyclean-host: maybe-mostlyclean-tk
1095
mostlyclean-host: maybe-mostlyclean-libtermcap
1096
mostlyclean-host: maybe-mostlyclean-utils
1097
+mostlyclean-host: maybe-mostlyclean-libada
1098
mostlyclean-host: maybe-mostlyclean-gnattools
1099
mostlyclean-host: maybe-mostlyclean-lto-plugin
1101
@@ -1979,6 +1991,7 @@
1102
clean-host: maybe-clean-tk
1103
clean-host: maybe-clean-libtermcap
1104
clean-host: maybe-clean-utils
1105
+clean-host: maybe-clean-libada
1106
clean-host: maybe-clean-gnattools
1107
clean-host: maybe-clean-lto-plugin
1109
@@ -2061,6 +2074,7 @@
1110
distclean-host: maybe-distclean-tk
1111
distclean-host: maybe-distclean-libtermcap
1112
distclean-host: maybe-distclean-utils
1113
+distclean-host: maybe-distclean-libada
1114
distclean-host: maybe-distclean-gnattools
1115
distclean-host: maybe-distclean-lto-plugin
1117
@@ -2143,6 +2157,7 @@
1118
maintainer-clean-host: maybe-maintainer-clean-tk
1119
maintainer-clean-host: maybe-maintainer-clean-libtermcap
1120
maintainer-clean-host: maybe-maintainer-clean-utils
1121
+maintainer-clean-host: maybe-maintainer-clean-libada
1122
maintainer-clean-host: maybe-maintainer-clean-gnattools
1123
maintainer-clean-host: maybe-maintainer-clean-lto-plugin
1125
@@ -2280,6 +2295,7 @@
1127
maybe-check-libtermcap \
1129
+ maybe-check-libada \
1130
maybe-check-gnattools \
1131
maybe-check-lto-plugin
1133
@@ -2388,6 +2404,7 @@
1135
maybe-install-libtermcap \
1136
maybe-install-utils \
1137
+ maybe-install-libada \
1138
maybe-install-gnattools \
1139
maybe-install-lto-plugin
1141
@@ -2435,6 +2452,7 @@
1143
maybe-install-libtermcap \
1144
maybe-install-utils \
1145
+ maybe-install-libada \
1146
maybe-install-gnattools \
1147
maybe-install-lto-plugin
1149
@@ -2537,6 +2555,7 @@
1150
maybe-install-strip-tk \
1151
maybe-install-strip-libtermcap \
1152
maybe-install-strip-utils \
1153
+ maybe-install-strip-libada \
1154
maybe-install-strip-gnattools \
1155
maybe-install-strip-lto-plugin
1157
@@ -29422,6 +29441,331 @@
1161
+.PHONY: configure-libada maybe-configure-libada
1162
+maybe-configure-libada:
1164
+configure-libada: stage_current
1165
+@endif gcc-bootstrap
1167
+maybe-configure-libada: configure-libada
1169
+ @: $(MAKE); $(unstage)
1170
+ @r=`${PWD_COMMAND}`; export r; \
1171
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1172
+ test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \
1173
+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \
1175
+ echo Configuring in $(HOST_SUBDIR)/libada; \
1176
+ cd "$(HOST_SUBDIR)/libada" || exit 1; \
1177
+ case $(srcdir) in \
1178
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
1179
+ *) topdir=`echo $(HOST_SUBDIR)/libada/ | \
1180
+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
1182
+ srcdiroption="--srcdir=$${topdir}/libada"; \
1183
+ libsrcdir="$$s/libada"; \
1184
+ $(SHELL) $${libsrcdir}/configure \
1185
+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
1186
+ --target=${target_alias} $${srcdiroption} \
1194
+.PHONY: all-libada maybe-all-libada
1197
+all-libada: stage_current
1198
+@endif gcc-bootstrap
1201
+maybe-all-libada: all-libada
1202
+all-libada: configure-libada
1203
+ @: $(MAKE); $(unstage)
1204
+ @r=`${PWD_COMMAND}`; export r; \
1205
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1207
+ (cd $(HOST_SUBDIR)/libada && \
1208
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \
1215
+.PHONY: check-libada maybe-check-libada
1216
+maybe-check-libada:
1218
+maybe-check-libada: check-libada
1224
+.PHONY: install-libada maybe-install-libada
1225
+maybe-install-libada:
1227
+maybe-install-libada: install-libada
1233
+.PHONY: install-strip-libada maybe-install-strip-libada
1234
+maybe-install-strip-libada:
1236
+maybe-install-strip-libada: install-strip-libada
1238
+install-strip-libada:
1242
+# Other targets (info, dvi, pdf, etc.)
1244
+.PHONY: maybe-info-libada info-libada
1247
+maybe-info-libada: info-libada
1249
+# libada doesn't support info.
1254
+.PHONY: maybe-dvi-libada dvi-libada
1257
+maybe-dvi-libada: dvi-libada
1259
+# libada doesn't support dvi.
1264
+.PHONY: maybe-pdf-libada pdf-libada
1267
+maybe-pdf-libada: pdf-libada
1271
+ @: $(MAKE); $(unstage)
1272
+ @[ -f ./libada/Makefile ] || exit 0; \
1273
+ r=`${PWD_COMMAND}`; export r; \
1274
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1276
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1277
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1279
+ echo "Doing pdf in libada" ; \
1280
+ (cd $(HOST_SUBDIR)/libada && \
1281
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1282
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1283
+ "RANLIB=$${RANLIB}" \
1284
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1290
+.PHONY: maybe-html-libada html-libada
1293
+maybe-html-libada: html-libada
1295
+# libada doesn't support html.
1300
+.PHONY: maybe-TAGS-libada TAGS-libada
1303
+maybe-TAGS-libada: TAGS-libada
1305
+# libada doesn't support TAGS.
1310
+.PHONY: maybe-install-info-libada install-info-libada
1311
+maybe-install-info-libada:
1313
+maybe-install-info-libada: install-info-libada
1315
+# libada doesn't support install-info.
1316
+install-info-libada:
1320
+.PHONY: maybe-install-pdf-libada install-pdf-libada
1321
+maybe-install-pdf-libada:
1323
+maybe-install-pdf-libada: install-pdf-libada
1325
+install-pdf-libada: \
1326
+ configure-libada \
1328
+ @: $(MAKE); $(unstage)
1329
+ @[ -f ./libada/Makefile ] || exit 0; \
1330
+ r=`${PWD_COMMAND}`; export r; \
1331
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1333
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1334
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1336
+ echo "Doing install-pdf in libada" ; \
1337
+ (cd $(HOST_SUBDIR)/libada && \
1338
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1339
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1340
+ "RANLIB=$${RANLIB}" \
1341
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1347
+.PHONY: maybe-install-html-libada install-html-libada
1348
+maybe-install-html-libada:
1350
+maybe-install-html-libada: install-html-libada
1352
+install-html-libada: \
1353
+ configure-libada \
1355
+ @: $(MAKE); $(unstage)
1356
+ @[ -f ./libada/Makefile ] || exit 0; \
1357
+ r=`${PWD_COMMAND}`; export r; \
1358
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1360
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1361
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1363
+ echo "Doing install-html in libada" ; \
1364
+ (cd $(HOST_SUBDIR)/libada && \
1365
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1366
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1367
+ "RANLIB=$${RANLIB}" \
1368
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1374
+.PHONY: maybe-installcheck-libada installcheck-libada
1375
+maybe-installcheck-libada:
1377
+maybe-installcheck-libada: installcheck-libada
1379
+# libada doesn't support installcheck.
1380
+installcheck-libada:
1384
+.PHONY: maybe-mostlyclean-libada mostlyclean-libada
1385
+maybe-mostlyclean-libada:
1387
+maybe-mostlyclean-libada: mostlyclean-libada
1389
+mostlyclean-libada:
1390
+ @: $(MAKE); $(unstage)
1391
+ @[ -f ./libada/Makefile ] || exit 0; \
1392
+ r=`${PWD_COMMAND}`; export r; \
1393
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1395
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1396
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1398
+ echo "Doing mostlyclean in libada" ; \
1399
+ (cd $(HOST_SUBDIR)/libada && \
1400
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1401
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1402
+ "RANLIB=$${RANLIB}" \
1403
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1409
+.PHONY: maybe-clean-libada clean-libada
1410
+maybe-clean-libada:
1412
+maybe-clean-libada: clean-libada
1415
+ @: $(MAKE); $(unstage)
1416
+ @[ -f ./libada/Makefile ] || exit 0; \
1417
+ r=`${PWD_COMMAND}`; export r; \
1418
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1420
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1421
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1423
+ echo "Doing clean in libada" ; \
1424
+ (cd $(HOST_SUBDIR)/libada && \
1425
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1426
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1427
+ "RANLIB=$${RANLIB}" \
1428
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1434
+.PHONY: maybe-distclean-libada distclean-libada
1435
+maybe-distclean-libada:
1437
+maybe-distclean-libada: distclean-libada
1440
+ @: $(MAKE); $(unstage)
1441
+ @[ -f ./libada/Makefile ] || exit 0; \
1442
+ r=`${PWD_COMMAND}`; export r; \
1443
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1445
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1446
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1448
+ echo "Doing distclean in libada" ; \
1449
+ (cd $(HOST_SUBDIR)/libada && \
1450
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1451
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1452
+ "RANLIB=$${RANLIB}" \
1453
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1459
+.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada
1460
+maybe-maintainer-clean-libada:
1462
+maybe-maintainer-clean-libada: maintainer-clean-libada
1464
+maintainer-clean-libada:
1465
+ @: $(MAKE); $(unstage)
1466
+ @[ -f ./libada/Makefile ] || exit 0; \
1467
+ r=`${PWD_COMMAND}`; export r; \
1468
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1470
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1471
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1473
+ echo "Doing maintainer-clean in libada" ; \
1474
+ (cd $(HOST_SUBDIR)/libada && \
1475
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1476
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1477
+ "RANLIB=$${RANLIB}" \
1478
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1479
+ maintainer-clean) \
1486
.PHONY: configure-gnattools maybe-configure-gnattools
1487
maybe-configure-gnattools:
1489
@@ -29482,12 +29826,6 @@
1490
maybe-check-gnattools: check-gnattools
1493
- @: $(MAKE); $(unstage)
1494
- @r=`${PWD_COMMAND}`; export r; \
1495
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1497
- (cd $(HOST_SUBDIR)/gnattools && \
1498
- $(MAKE) $(FLAGS_TO_PASS) check)
1502
@@ -29528,24 +29866,8 @@
1504
maybe-info-gnattools: info-gnattools
1507
- configure-gnattools
1508
- @: $(MAKE); $(unstage)
1509
- @[ -f ./gnattools/Makefile ] || exit 0; \
1510
- r=`${PWD_COMMAND}`; export r; \
1511
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1513
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1514
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1516
- echo "Doing info in gnattools" ; \
1517
- (cd $(HOST_SUBDIR)/gnattools && \
1518
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1519
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1520
- "RANLIB=$${RANLIB}" \
1521
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1524
+# gnattools doesn't support info.
1529
@@ -29554,24 +29876,8 @@
1531
maybe-dvi-gnattools: dvi-gnattools
1534
- configure-gnattools
1535
- @: $(MAKE); $(unstage)
1536
- @[ -f ./gnattools/Makefile ] || exit 0; \
1537
- r=`${PWD_COMMAND}`; export r; \
1538
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1540
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1541
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1543
- echo "Doing dvi in gnattools" ; \
1544
- (cd $(HOST_SUBDIR)/gnattools && \
1545
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1546
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1547
- "RANLIB=$${RANLIB}" \
1548
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1551
+# gnattools doesn't support dvi.
1556
@@ -29606,24 +29912,8 @@
1558
maybe-html-gnattools: html-gnattools
1561
- configure-gnattools
1562
- @: $(MAKE); $(unstage)
1563
- @[ -f ./gnattools/Makefile ] || exit 0; \
1564
- r=`${PWD_COMMAND}`; export r; \
1565
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1567
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1568
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1570
- echo "Doing html in gnattools" ; \
1571
- (cd $(HOST_SUBDIR)/gnattools && \
1572
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1573
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1574
- "RANLIB=$${RANLIB}" \
1575
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1578
+# gnattools doesn't support html.
1583
@@ -29632,24 +29922,8 @@
1585
maybe-TAGS-gnattools: TAGS-gnattools
1588
- configure-gnattools
1589
- @: $(MAKE); $(unstage)
1590
- @[ -f ./gnattools/Makefile ] || exit 0; \
1591
- r=`${PWD_COMMAND}`; export r; \
1592
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1594
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1595
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1597
- echo "Doing TAGS in gnattools" ; \
1598
- (cd $(HOST_SUBDIR)/gnattools && \
1599
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1600
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1601
- "RANLIB=$${RANLIB}" \
1602
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1605
+# gnattools doesn't support TAGS.
1610
@@ -29658,25 +29932,8 @@
1612
maybe-install-info-gnattools: install-info-gnattools
1614
-install-info-gnattools: \
1615
- configure-gnattools \
1617
- @: $(MAKE); $(unstage)
1618
- @[ -f ./gnattools/Makefile ] || exit 0; \
1619
- r=`${PWD_COMMAND}`; export r; \
1620
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1622
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1623
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1625
- echo "Doing install-info in gnattools" ; \
1626
- (cd $(HOST_SUBDIR)/gnattools && \
1627
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1628
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1629
- "RANLIB=$${RANLIB}" \
1630
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1633
+# gnattools doesn't support install-info.
1634
+install-info-gnattools:
1638
@@ -29739,24 +29996,8 @@
1640
maybe-installcheck-gnattools: installcheck-gnattools
1642
-installcheck-gnattools: \
1643
- configure-gnattools
1644
- @: $(MAKE); $(unstage)
1645
- @[ -f ./gnattools/Makefile ] || exit 0; \
1646
- r=`${PWD_COMMAND}`; export r; \
1647
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1649
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1650
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1652
- echo "Doing installcheck in gnattools" ; \
1653
- (cd $(HOST_SUBDIR)/gnattools && \
1654
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1655
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1656
- "RANLIB=$${RANLIB}" \
1657
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1660
+# gnattools doesn't support installcheck.
1661
+installcheck-gnattools:
1665
@@ -40970,13 +41211,8 @@
1667
maybe-check-target-libada: check-target-libada
1669
+# Dummy target for uncheckable module.
1670
check-target-libada:
1671
- @: $(MAKE); $(unstage)
1672
- @r=`${PWD_COMMAND}`; export r; \
1673
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1674
- $(NORMAL_TARGET_EXPORTS) \
1675
- (cd $(TARGET_SUBDIR)/libada && \
1676
- $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
1678
@endif target-libada
1680
@@ -40985,13 +41221,8 @@
1682
maybe-install-target-libada: install-target-libada
1684
-install-target-libada: installdirs
1685
- @: $(MAKE); $(unstage)
1686
- @r=`${PWD_COMMAND}`; export r; \
1687
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1688
- $(NORMAL_TARGET_EXPORTS) \
1689
- (cd $(TARGET_SUBDIR)/libada && \
1690
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
1691
+# Dummy target for uninstallable.
1692
+install-target-libada:
1694
@endif target-libada
1696
@@ -41000,13 +41231,8 @@
1698
maybe-install-strip-target-libada: install-strip-target-libada
1700
-install-strip-target-libada: installdirs
1701
- @: $(MAKE); $(unstage)
1702
- @r=`${PWD_COMMAND}`; export r; \
1703
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1704
- $(NORMAL_TARGET_EXPORTS) \
1705
- (cd $(TARGET_SUBDIR)/libada && \
1706
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
1707
+# Dummy target for uninstallable.
1708
+install-strip-target-libada:
1710
@endif target-libada
1712
@@ -41017,24 +41243,8 @@
1714
maybe-info-target-libada: info-target-libada
1716
-info-target-libada: \
1717
- configure-target-libada
1718
- @: $(MAKE); $(unstage)
1719
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1720
- r=`${PWD_COMMAND}`; export r; \
1721
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1722
- $(NORMAL_TARGET_EXPORTS) \
1723
- echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
1724
- for flag in $(EXTRA_TARGET_FLAGS); do \
1725
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1727
- (cd $(TARGET_SUBDIR)/libada && \
1728
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1729
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1730
- "RANLIB=$${RANLIB}" \
1731
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1734
+# libada doesn't support info.
1735
+info-target-libada:
1737
@endif target-libada
1739
@@ -41043,24 +41253,8 @@
1741
maybe-dvi-target-libada: dvi-target-libada
1743
-dvi-target-libada: \
1744
- configure-target-libada
1745
- @: $(MAKE); $(unstage)
1746
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1747
- r=`${PWD_COMMAND}`; export r; \
1748
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1749
- $(NORMAL_TARGET_EXPORTS) \
1750
- echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
1751
- for flag in $(EXTRA_TARGET_FLAGS); do \
1752
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1754
- (cd $(TARGET_SUBDIR)/libada && \
1755
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1756
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1757
- "RANLIB=$${RANLIB}" \
1758
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1761
+# libada doesn't support dvi.
1764
@endif target-libada
1766
@@ -41095,24 +41289,8 @@
1768
maybe-html-target-libada: html-target-libada
1770
-html-target-libada: \
1771
- configure-target-libada
1772
- @: $(MAKE); $(unstage)
1773
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1774
- r=`${PWD_COMMAND}`; export r; \
1775
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1776
- $(NORMAL_TARGET_EXPORTS) \
1777
- echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
1778
- for flag in $(EXTRA_TARGET_FLAGS); do \
1779
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1781
- (cd $(TARGET_SUBDIR)/libada && \
1782
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1783
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1784
- "RANLIB=$${RANLIB}" \
1785
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1788
+# libada doesn't support html.
1789
+html-target-libada:
1791
@endif target-libada
1793
@@ -41121,24 +41299,8 @@
1795
maybe-TAGS-target-libada: TAGS-target-libada
1797
-TAGS-target-libada: \
1798
- configure-target-libada
1799
- @: $(MAKE); $(unstage)
1800
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1801
- r=`${PWD_COMMAND}`; export r; \
1802
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1803
- $(NORMAL_TARGET_EXPORTS) \
1804
- echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
1805
- for flag in $(EXTRA_TARGET_FLAGS); do \
1806
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1808
- (cd $(TARGET_SUBDIR)/libada && \
1809
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1810
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1811
- "RANLIB=$${RANLIB}" \
1812
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1815
+# libada doesn't support TAGS.
1816
+TAGS-target-libada:
1818
@endif target-libada
1820
@@ -41147,25 +41309,8 @@
1822
maybe-install-info-target-libada: install-info-target-libada
1824
-install-info-target-libada: \
1825
- configure-target-libada \
1826
- info-target-libada
1827
- @: $(MAKE); $(unstage)
1828
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1829
- r=`${PWD_COMMAND}`; export r; \
1830
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1831
- $(NORMAL_TARGET_EXPORTS) \
1832
- echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
1833
- for flag in $(EXTRA_TARGET_FLAGS); do \
1834
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1836
- (cd $(TARGET_SUBDIR)/libada && \
1837
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1838
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1839
- "RANLIB=$${RANLIB}" \
1840
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1843
+# libada doesn't support install-info.
1844
+install-info-target-libada:
1846
@endif target-libada
1848
@@ -41228,24 +41373,8 @@
1850
maybe-installcheck-target-libada: installcheck-target-libada
1852
-installcheck-target-libada: \
1853
- configure-target-libada
1854
- @: $(MAKE); $(unstage)
1855
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1856
- r=`${PWD_COMMAND}`; export r; \
1857
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1858
- $(NORMAL_TARGET_EXPORTS) \
1859
- echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
1860
- for flag in $(EXTRA_TARGET_FLAGS); do \
1861
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1863
- (cd $(TARGET_SUBDIR)/libada && \
1864
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1865
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1866
- "RANLIB=$${RANLIB}" \
1867
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1870
+# libada doesn't support installcheck.
1871
+installcheck-target-libada:
1873
@endif target-libada
1875
@@ -45729,7 +45858,7 @@
1876
all-stageprofile-libcpp: maybe-all-stageprofile-intl
1877
all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
1878
all-fixincludes: maybe-all-libiberty
1879
-all-gnattools: maybe-all-target-libada
1880
+all-gnattools: maybe-all-libada
1881
all-lto-plugin: maybe-all-libiberty
1883
all-stage1-lto-plugin: maybe-all-stage1-libiberty
1884
Index: b/src/configure.ac
1885
===================================================================
1886
--- a/src/configure.ac
1887
+++ b/src/configure.ac
1890
# these libraries are used by various programs built for the host environment
1892
-host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
1893
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv libada"
1895
# these tools are built for the host environment
1896
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
1899
# Some are only suitable for cross toolchains.
1900
# Remove these if host=target.
1901
-cross_only="target-libgloss target-newlib target-opcodes"
1902
+cross_only="target-libgloss target-newlib target-opcodes target-libada"
1904
case $is_cross_compiler in
1905
no) skipdirs="${skipdirs} ${cross_only}" ;;
added
removed
.svn/pristine/f9/f95a4d93150d16543e2cc85550f67725889bb4cf.svn-base
