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
@@ -1365,6 +1337,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
@@ -2362,153 +2339,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)
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) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \
271
-../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS)
272
- $(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \
275
../stamp-gnatlib-$(RTSDIR):
276
@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
278
@@ -2545,14 +2375,10 @@
279
# Also install the .dSYM directories if they exist (these directories
280
# contain the debug information for the shared libraries on darwin)
281
for file in gnat gnarl; do \
282
- if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
283
- $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
284
+ if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
285
+ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
286
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
288
- if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
289
- $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
290
- $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
292
if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
293
$(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
294
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
295
@@ -2565,19 +2391,7 @@
296
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
297
cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
299
-../stamp-gnatlib2-$(RTSDIR):
300
- $(RM) $(RTSDIR)/s-*.ali
301
- $(RM) $(RTSDIR)/s-*$(objext)
302
- $(RM) $(RTSDIR)/a-*.ali
303
- $(RM) $(RTSDIR)/a-*$(objext)
304
- $(RM) $(RTSDIR)/*.ali
305
- $(RM) $(RTSDIR)/*$(objext)
306
- $(RM) $(RTSDIR)/*$(arext)
307
- $(RM) $(RTSDIR)/*$(soext)
308
- touch ../stamp-gnatlib2-$(RTSDIR)
309
- $(RM) ../stamp-gnatlib-$(RTSDIR)
311
-../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
312
+../stamp-gnatlib1-$(RTSDIR): Makefile
315
$(CHMOD) u+w $(RTSDIR)
316
@@ -2642,7 +2456,7 @@
317
# Example: cd $(RTSDIR); ar rc libfoo.a $(LONG_LIST_OF_OBJS)
318
# is guaranteed to overflow the buffer.
320
-gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
321
+gnatlib: ../stamp-gnatlib1-$(RTSDIR) $(RTSDIR)/s-oscons.ads
323
$(MAKE) -C $(RTSDIR) \
324
CC="`echo \"$(GCC_FOR_TARGET)\" \
325
@@ -2679,32 +2493,47 @@
327
# Warning: this target assumes that LIBRARY_VERSION has been set correctly.
328
gnatlib-shared-default:
329
- $(MAKE) $(FLAGS_TO_PASS) \
330
- GNATLIBFLAGS="$(GNATLIBFLAGS)" \
331
- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
332
- GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
333
- MULTISUBDIR="$(MULTISUBDIR)" \
334
- THREAD_KIND="$(THREAD_KIND)" \
336
- $(RM) $(RTSDIR)/libgna*$(soext)
337
+ $(MAKE) -C $(RTSDIR) \
338
+ CC="`echo \"$(GCC_FOR_TARGET)\" \
339
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
340
+ INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
341
+ CFLAGS="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
342
+ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
343
+ srcdir=$(fsrcdir) \
344
+ -f ../Makefile $(LIBGNAT_OBJS)
345
+ $(MAKE) -C $(RTSDIR) \
346
+ CC="`echo \"$(GCC_FOR_TARGET)\" \
347
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
349
+ CFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
350
+ ADAFLAGS="$(GNATLIBFLAGS) $(PICFLAG_FOR_TARGET)" \
351
+ FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
352
+ srcdir=$(fsrcdir) \
355
+ $(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
356
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
357
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
358
$(PICFLAG_FOR_TARGET) \
359
- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
360
+ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
361
$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
362
- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
363
+ $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
365
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
366
| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
367
$(PICFLAG_FOR_TARGET) \
368
- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
369
+ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
370
$(GNATRTL_TASKING_OBJS) \
371
- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
372
+ $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
374
- cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
376
- cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
378
+ cd $(RTSDIR); for lib in gnat gnarl; do \
379
+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
380
+ $(LN_S) $$l.1 $$l; \
382
+# Delete the object files, lest they be linked statically into the tools
383
+# executables. Only the .ali, .a and .so files must remain.
384
+ rm -f $(RTSDIR)/*.o
385
+ $(CHMOD) a-wx $(RTSDIR)/*.ali
388
$(MAKE) $(FLAGS_TO_PASS) \
389
@@ -2713,17 +2542,15 @@
390
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
391
MULTISUBDIR="$(MULTISUBDIR)" \
392
THREAD_KIND="$(THREAD_KIND)" \
393
- gnatlib-shared-default
394
- $(MV) $(RTSDIR)/libgna*$(soext) .
395
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
397
+ $(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
398
$(MAKE) $(FLAGS_TO_PASS) \
399
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
400
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
401
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
402
MULTISUBDIR="$(MULTISUBDIR)" \
403
THREAD_KIND="$(THREAD_KIND)" \
405
- $(MV) libgna*$(soext) $(RTSDIR)
406
+ gnatlib-shared-default
408
gnatlib-shared-dual-win32:
409
$(MAKE) $(FLAGS_TO_PASS) \
410
@@ -2733,17 +2560,15 @@
411
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
412
MULTISUBDIR="$(MULTISUBDIR)" \
413
THREAD_KIND="$(THREAD_KIND)" \
414
- gnatlib-shared-win32
415
- $(MV) $(RTSDIR)/libgna*$(soext) .
416
- $(RM) ../stamp-gnatlib2-$(RTSDIR)
418
+ $(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
419
$(MAKE) $(FLAGS_TO_PASS) \
420
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
421
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
422
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
423
MULTISUBDIR="$(MULTISUBDIR)" \
424
THREAD_KIND="$(THREAD_KIND)" \
426
- $(MV) libgna*$(soext) $(RTSDIR)
427
+ gnatlib-shared-win32
429
# ??? we need to add the option to support auto-import of arrays/records to
430
# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
431
@@ -2881,28 +2706,6 @@
432
THREAD_KIND="$(THREAD_KIND)" \
433
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" gnatlib
435
-# Compiling object files from source files.
437
-# Note that dependencies on obstack.h are not written
438
-# because that file is not part of GCC.
439
-# Dependencies on gvarargs.h are not written
440
-# because all that file does, when not compiling with GCC,
441
-# is include the system varargs.h.
443
-b_gnatl.adb : $(GNATLINK_OBJS)
444
- $(GNATBIND) $(ADA_INCLUDES) -o b_gnatl.adb gnatlink.ali
446
-b_gnatl.o : b_gnatl.adb
447
- $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN \
448
- $< $(OUTPUT_OPTION)
450
-b_gnatm.adb : $(GNATMAKE_OBJS)
451
- $(GNATBIND) $(ADA_INCLUDES) -o b_gnatm.adb gnatmake.ali
453
-b_gnatm.o : b_gnatm.adb
454
- $(CC) -c $(ALL_ADAFLAGS) $(ADA_INCLUDES) -gnatws -gnatyN \
455
- $< $(OUTPUT_OPTION)
457
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
458
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
460
Index: b/src/gnattools/Makefile.in
461
===================================================================
462
--- a/src/gnattools/Makefile.in
463
+++ b/src/gnattools/Makefile.in
465
# Default target; must be first.
468
+.NOTPARALLEL: # don't run multiple gnatmakes in parallel in the same directory
471
# Standard autoconf-set variables.
476
target_noncanonical=@target_noncanonical@
478
-# Variables for the user (or the top level) to override.
485
-PWD_COMMAND = $${PWDCMD-pwd}
487
-# The tedious process of getting CFLAGS right.
489
-GCC_WARN_CFLAGS = -W -Wall
490
-WARN_CFLAGS = @warn_cflags@
492
-ADA_CFLAGS=@ADA_CFLAGS@
494
-# Variables for gnattools.
495
-ADAFLAGS= -gnatpg -gnata
497
-# For finding the GCC build dir, which is used far too much
500
-# Absolute srcdir for gcc (why do we want absolute? I dunno)
501
-fsrcdir := $(shell cd $(srcdir)/../gcc/; ${PWD_COMMAND})
503
-# Useful "subroutines" for the excess includes
504
-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir)/ada -I$(fsrcdir)/config \
505
- -I$(fsrcdir)/../include -I$(fsrcdir)
506
-ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
508
-# Variables for gnattools, native
509
-TOOLS_FLAGS_TO_PASS_NATIVE= \
510
- "CC=../../xgcc -B../../" \
511
- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
512
- "LDFLAGS=$(LDFLAGS)" \
513
- "ADAFLAGS=$(ADAFLAGS)" \
514
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
515
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
516
- "ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
517
- "exeext=$(exeext)" \
518
- "fsrcdir=$(fsrcdir)" \
519
- "srcdir=$(fsrcdir)" \
520
- "GNATMAKE=../../gnatmake" \
521
- "GNATLINK=../../gnatlink" \
522
- "GNATBIND=../../gnatbind" \
525
-# Variables for regnattools
526
-TOOLS_FLAGS_TO_PASS_RE= \
527
- "CC=../../xgcc -B../../" \
528
- "CFLAGS=$(CFLAGS)" \
529
- "ADAFLAGS=$(ADAFLAGS)" \
530
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
531
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
532
- "ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
533
- "exeext=$(exeext)" \
534
- "fsrcdir=$(fsrcdir)" \
535
- "srcdir=$(fsrcdir)" \
536
- "GNATMAKE=../../gnatmake" \
537
- "GNATLINK=../../gnatlink" \
538
- "GNATBIND=../../gnatbind" \
541
-# Variables for gnattools, cross
542
-TOOLS_FLAGS_TO_PASS_CROSS= \
544
- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
545
- "LDFLAGS=$(LDFLAGS)" \
546
- "ADAFLAGS=$(ADAFLAGS)" \
547
- "ADA_CFLAGS=$(ADA_CFLAGS)" \
548
- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
549
- "ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
550
- "exeext=$(exeext)" \
551
- "fsrcdir=$(fsrcdir)" \
552
- "srcdir=$(fsrcdir)" \
553
- "GNATMAKE=gnatmake" \
554
- "GNATLINK=gnatlink" \
555
- "GNATBIND=gnatbind" \
556
- "TOOLSCASE=cross" \
559
+INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
560
+ADA_CFLAGS=-O2 -gnatn
561
+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
562
+LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
563
+ @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
564
+SHARED_ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
565
+STATIC_ADA_LIBS := ../gcc/ada/rts/libgnat.a
566
+STATIC_GCC_LIBS := ../gcc/libcommon-target.a ../gcc/libcommon.a ../libcpp/libcpp.a \
567
+../libbacktrace/.libs/libbacktrace.a ../libiberty/libiberty.a
569
+# We will use the just-built compiler to compile and link everything.
570
+GCC=../gcc/xgcc -B../gcc/
574
@@ -121,121 +57,229 @@
575
EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
576
TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
578
+# Stage 1 builds xgcc and gnatbind; we can use them to build
579
+# gnatmake-static and gnatlink-static, then use gnatmake-static and
580
+# gnatlink-static to build the other tools. The reason we first build
581
+# statically-linked versions of gnatmake and gnatlink is so we can run
582
+# them with confidence on all build platforms, without LD_LIBRARY_PATH
583
+# or some such variable.
585
+# The tools we will build using gnatmake-static and gnatlink-static.
586
+TOOLS := gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatls gnatlink
587
+TOOLS += gnatmake gnatname gnatprep gnatxref
589
+# Since we don't have gnatmake, we must specify the full list of
590
+# object files necessary to build gnatmake and gnatlink.
591
+# TODO: remove from these lists the objects that are part of
592
+# libgnatvsn and libgnatprj.
654
+mlib-tgt-specific.o \
709
+$(EXTRA_GNATMAKE_OBJS)
714
.PHONY: gnattools gnattools-native gnattools-cross regnattools
715
gnattools: @default_gnattools_target@
718
-$(GCC_DIR)/stamp-gnatlib-rts:
719
- @if [ ! -f $(GCC_DIR)/stamp-gnatlib-rts ] ; \
721
- echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \
728
# Build directory for the tools. Let's copy the target-dependent
729
# sources using the same mechanism as for gnatlib. The other sources are
730
-# accessed using the vpath directive in ada/Makefile.in
731
+# accessed using the vpath directive.
734
+stamp-gnattools-sources:
735
+ $(LN_S) ../gcc/ada/sdefault.adb ../gcc/ada/snames.ads ../gcc/ada/snames.adb .
736
+ $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
737
+ rm -f $(word 1,$(subst <, ,$(PAIR)));\
738
+ $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
739
+ $(word 1,$(subst <, ,$(PAIR)));)
742
+gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
743
+gnattools-native: stamp-gnattools-sources
744
+gnattools-native: $(TOOLS)
746
+$(TOOLS) gnatcmd: | gnatmake-static gnatlink-static
748
+vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
749
+vpath %.h @srcdir@/../gcc/ada
750
+vpath %.adb .:@srcdir@/../gcc/ada
751
+vpath %.ads @srcdir@/../gcc/ada
755
+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
756
+ $(GCC) -o $@ $^ ../gcc/ada/rts/libgnat.a $(STATIC_GCC_LIBS)
758
+gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o
759
+ $(GCC) -o $@ $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS)
761
+b_gnatl.adb: $(GNATLINK_OBJS)
762
+ ../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatlink.ali
766
+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
767
+ $(GCC) -o $@ $(ADA_CFLAGS) $^ $(STATIC_ADA_LIBS) $(STATIC_GCC_LIBS)
769
+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o
770
+ $(GCC) -o $@ $(ADA_CFLAGS) $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS)
772
+b_gnatm.adb: $(GNATMAKE_OBJS)
773
+ ../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatmake.ali
777
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
779
+ --GNATBIND=../gcc/gnatbind
780
+ ./gnatlink-static -o $@ $@.ali $(ADA_INCLUDES) $(SHARED_ADA_LIBS) \
781
+ --GCC="$(GCC) $(ADA_INCLUDES)" $(STATIC_GCC_LIBS)
786
+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref: \
788
+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
790
+ --GNATBIND=../gcc/gnatbind
791
+ ./gnatlink-static -o $@ $@.ali $^ \
792
+ $(ADA_INCLUDES) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) \
793
+ --GCC="$(GCC) $(ADA_INCLUDES)"
795
+# Force compiling sdefault.adb, not .ads, to produce sdefault.o
796
+sdefault.o: sdefault.adb
798
+sdefault.adb: stamp-gnattools-sources
800
+# Because these sources don't exist when the Makefile is evaluated:
801
+snames.o: snames.adb snames.ads
803
+snames.adb snames.ads: stamp-gnattools-sources
806
+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
809
+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
811
-$(GCC_DIR)/stamp-tools:
812
- -rm -rf $(GCC_DIR)/ada/tools
813
- -mkdir -p $(GCC_DIR)/ada/tools
814
- -(cd $(GCC_DIR)/ada/tools; $(LN_S) ../sdefault.adb ../snames.ads ../snames.adb .)
815
- -$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
816
- rm -f $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));\
817
- $(LN_S) $(fsrcdir)/ada/$(word 2,$(subst <, ,$(PAIR))) \
818
- $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
819
- touch $(GCC_DIR)/stamp-tools
821
-# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap
822
-# reasons: gnatmake should be built with a recent compiler, a recent compiler
823
-# may not generate ALI files compatible with an old gnatmake so it is important
824
-# to be able to build gnatmake without a version of gnatmake around. Once
825
-# everything has been compiled once, gnatmake can be recompiled with itself
826
-# (see target regnattools)
827
-gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib-rts
829
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
830
- $(TOOLS_FLAGS_TO_PASS_NATIVE) \
831
- ../../gnatmake$(exeext) ../../gnatlink$(exeext)
833
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
834
- $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
836
-# gnatmake/link can be built with recent gnatmake/link if they are available.
837
-# This is especially convenient for building cross tools or for rebuilding
838
-# the tools when the original bootstrap has already be done.
839
-regnattools: $(GCC_DIR)/stamp-gnatlib-rts
841
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
842
- $(TOOLS_FLAGS_TO_PASS_RE) INCLUDES="" \
843
- gnatmake-re gnatlink-re
845
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
846
- $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
848
-# For cross builds of gnattools,
849
-# put the host RTS dir first in the PATH to hide the default runtime
850
-# files that are among the sources
851
-# FIXME: This should be done in configure.
852
-RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib )))
853
-gnattools-cross: $(GCC_DIR)/stamp-tools
855
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
856
- $(TOOLS_FLAGS_TO_PASS_CROSS) INCLUDES="" \
857
- gnatmake-re gnatlink-re
859
- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
860
- $(TOOLS_FLAGS_TO_PASS_CROSS) common-tools
861
- # Rename cross tools to where the GCC makefile wants them when
862
- # installing. FIXME: installation should be done elsewhere.
863
- if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \
864
- mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \
866
- if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \
867
- mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \
869
- if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \
870
- mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \
872
- if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \
873
- mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \
875
- if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \
876
- mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \
878
- if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \
879
- mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \
881
- if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \
882
- mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \
884
- if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \
885
- mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \
887
- if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \
888
- mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \
890
- if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \
891
- mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \
893
- if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \
894
- mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \
896
- if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \
897
- mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \
899
- if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \
900
- mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \
902
- if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \
903
- mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \
906
+ $(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
912
# Installation rules.
914
+ $(INSTALL) -s gnatmake gnatlink $(TOOLS) $(DESTDIR)$(bindir)
916
install-strip: install
922
+ $(RM) gnatmake gnatlink $(TOOLS) *.o *.ali
925
+ $(RM) *.ads *.adb stamp-gnattools-sources
928
$(RM) Makefile config.status config.log
929
Index: b/src/libada/Makefile.in
930
===================================================================
931
--- a/src/libada/Makefile.in
932
+++ b/src/libada/Makefile.in
934
-fexceptions -DIN_RTS @have_getipinfo@
936
host_subdir = @host_subdir@
937
-GCC_DIR=$(MULTIBUILDTOP)../../$(host_subdir)/gcc
938
+GCC_DIR=$(MULTIBUILDTOP)../$(host_subdir)/gcc
940
target_noncanonical:=@target_noncanonical@
941
version := $(shell cat $(srcdir)/../gcc/BASE-VER)
942
Index: b/src/Makefile.def
943
===================================================================
944
--- a/src/Makefile.def
945
+++ b/src/Makefile.def
948
missing=maintainer-clean; };
949
host_modules= { module= utils; no_check=true; };
950
-host_modules= { module= gnattools; };
951
+host_modules= { module= libada; no_install=true; no_check=true;
956
+ missing= install-info;
957
+ missing= installcheck; };
958
+host_modules= { module= gnattools; no_check=true;
963
+ missing= install-info;
964
+ missing= installcheck; };
965
host_modules= { module= lto-plugin; bootstrap=true;
966
extra_configure_flags=--enable-shared; };
969
target_modules = { module= zlib; };
970
target_modules = { module= boehm-gc; };
971
target_modules = { module= rda; };
972
-target_modules = { module= libada; };
973
+target_modules = { module= libada; no_install=true; no_check=true;
978
+ missing= install-info;
979
+ missing= installcheck; };
980
target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
981
target_modules = { module= libitm; lib_path=.libs; };
982
target_modules = { module= libatomic; lib_path=.libs; };
985
dependencies = { module=all-fixincludes; on=all-libiberty; };
987
-dependencies = { module=all-gnattools; on=all-target-libada; };
988
+dependencies = { module=all-gnattools; on=all-libada; };
990
dependencies = { module=all-lto-plugin; on=all-libiberty; };
992
Index: b/src/Makefile.in
993
===================================================================
994
--- a/src/Makefile.in
995
+++ b/src/Makefile.in
998
maybe-configure-libtermcap \
999
maybe-configure-utils \
1000
+ maybe-configure-libada \
1001
maybe-configure-gnattools \
1002
maybe-configure-lto-plugin
1003
.PHONY: configure-target
1004
@@ -1062,6 +1063,7 @@
1005
all-host: maybe-all-tk
1006
all-host: maybe-all-libtermcap
1007
all-host: maybe-all-utils
1008
+all-host: maybe-all-libada
1009
all-host: maybe-all-gnattools
1010
@if lto-plugin-no-bootstrap
1011
all-host: maybe-all-lto-plugin
1012
@@ -1159,6 +1161,7 @@
1013
info-host: maybe-info-tk
1014
info-host: maybe-info-libtermcap
1015
info-host: maybe-info-utils
1016
+info-host: maybe-info-libada
1017
info-host: maybe-info-gnattools
1018
info-host: maybe-info-lto-plugin
1020
@@ -1241,6 +1244,7 @@
1021
dvi-host: maybe-dvi-tk
1022
dvi-host: maybe-dvi-libtermcap
1023
dvi-host: maybe-dvi-utils
1024
+dvi-host: maybe-dvi-libada
1025
dvi-host: maybe-dvi-gnattools
1026
dvi-host: maybe-dvi-lto-plugin
1028
@@ -1323,6 +1327,7 @@
1029
pdf-host: maybe-pdf-tk
1030
pdf-host: maybe-pdf-libtermcap
1031
pdf-host: maybe-pdf-utils
1032
+pdf-host: maybe-pdf-libada
1033
pdf-host: maybe-pdf-gnattools
1034
pdf-host: maybe-pdf-lto-plugin
1036
@@ -1405,6 +1410,7 @@
1037
html-host: maybe-html-tk
1038
html-host: maybe-html-libtermcap
1039
html-host: maybe-html-utils
1040
+html-host: maybe-html-libada
1041
html-host: maybe-html-gnattools
1042
html-host: maybe-html-lto-plugin
1044
@@ -1487,6 +1493,7 @@
1045
TAGS-host: maybe-TAGS-tk
1046
TAGS-host: maybe-TAGS-libtermcap
1047
TAGS-host: maybe-TAGS-utils
1048
+TAGS-host: maybe-TAGS-libada
1049
TAGS-host: maybe-TAGS-gnattools
1050
TAGS-host: maybe-TAGS-lto-plugin
1052
@@ -1569,6 +1576,7 @@
1053
install-info-host: maybe-install-info-tk
1054
install-info-host: maybe-install-info-libtermcap
1055
install-info-host: maybe-install-info-utils
1056
+install-info-host: maybe-install-info-libada
1057
install-info-host: maybe-install-info-gnattools
1058
install-info-host: maybe-install-info-lto-plugin
1060
@@ -1651,6 +1659,7 @@
1061
install-pdf-host: maybe-install-pdf-tk
1062
install-pdf-host: maybe-install-pdf-libtermcap
1063
install-pdf-host: maybe-install-pdf-utils
1064
+install-pdf-host: maybe-install-pdf-libada
1065
install-pdf-host: maybe-install-pdf-gnattools
1066
install-pdf-host: maybe-install-pdf-lto-plugin
1068
@@ -1733,6 +1742,7 @@
1069
install-html-host: maybe-install-html-tk
1070
install-html-host: maybe-install-html-libtermcap
1071
install-html-host: maybe-install-html-utils
1072
+install-html-host: maybe-install-html-libada
1073
install-html-host: maybe-install-html-gnattools
1074
install-html-host: maybe-install-html-lto-plugin
1076
@@ -1815,6 +1825,7 @@
1077
installcheck-host: maybe-installcheck-tk
1078
installcheck-host: maybe-installcheck-libtermcap
1079
installcheck-host: maybe-installcheck-utils
1080
+installcheck-host: maybe-installcheck-libada
1081
installcheck-host: maybe-installcheck-gnattools
1082
installcheck-host: maybe-installcheck-lto-plugin
1084
@@ -1897,6 +1908,7 @@
1085
mostlyclean-host: maybe-mostlyclean-tk
1086
mostlyclean-host: maybe-mostlyclean-libtermcap
1087
mostlyclean-host: maybe-mostlyclean-utils
1088
+mostlyclean-host: maybe-mostlyclean-libada
1089
mostlyclean-host: maybe-mostlyclean-gnattools
1090
mostlyclean-host: maybe-mostlyclean-lto-plugin
1092
@@ -1979,6 +1991,7 @@
1093
clean-host: maybe-clean-tk
1094
clean-host: maybe-clean-libtermcap
1095
clean-host: maybe-clean-utils
1096
+clean-host: maybe-clean-libada
1097
clean-host: maybe-clean-gnattools
1098
clean-host: maybe-clean-lto-plugin
1100
@@ -2061,6 +2074,7 @@
1101
distclean-host: maybe-distclean-tk
1102
distclean-host: maybe-distclean-libtermcap
1103
distclean-host: maybe-distclean-utils
1104
+distclean-host: maybe-distclean-libada
1105
distclean-host: maybe-distclean-gnattools
1106
distclean-host: maybe-distclean-lto-plugin
1108
@@ -2143,6 +2157,7 @@
1109
maintainer-clean-host: maybe-maintainer-clean-tk
1110
maintainer-clean-host: maybe-maintainer-clean-libtermcap
1111
maintainer-clean-host: maybe-maintainer-clean-utils
1112
+maintainer-clean-host: maybe-maintainer-clean-libada
1113
maintainer-clean-host: maybe-maintainer-clean-gnattools
1114
maintainer-clean-host: maybe-maintainer-clean-lto-plugin
1116
@@ -2280,6 +2295,7 @@
1118
maybe-check-libtermcap \
1120
+ maybe-check-libada \
1121
maybe-check-gnattools \
1122
maybe-check-lto-plugin
1124
@@ -2388,6 +2404,7 @@
1126
maybe-install-libtermcap \
1127
maybe-install-utils \
1128
+ maybe-install-libada \
1129
maybe-install-gnattools \
1130
maybe-install-lto-plugin
1132
@@ -2435,6 +2452,7 @@
1134
maybe-install-libtermcap \
1135
maybe-install-utils \
1136
+ maybe-install-libada \
1137
maybe-install-gnattools \
1138
maybe-install-lto-plugin
1140
@@ -2537,6 +2555,7 @@
1141
maybe-install-strip-tk \
1142
maybe-install-strip-libtermcap \
1143
maybe-install-strip-utils \
1144
+ maybe-install-strip-libada \
1145
maybe-install-strip-gnattools \
1146
maybe-install-strip-lto-plugin
1148
@@ -29422,6 +29441,331 @@
1152
+.PHONY: configure-libada maybe-configure-libada
1153
+maybe-configure-libada:
1155
+configure-libada: stage_current
1156
+@endif gcc-bootstrap
1158
+maybe-configure-libada: configure-libada
1160
+ @: $(MAKE); $(unstage)
1161
+ @r=`${PWD_COMMAND}`; export r; \
1162
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1163
+ test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \
1164
+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \
1166
+ echo Configuring in $(HOST_SUBDIR)/libada; \
1167
+ cd "$(HOST_SUBDIR)/libada" || exit 1; \
1168
+ case $(srcdir) in \
1169
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
1170
+ *) topdir=`echo $(HOST_SUBDIR)/libada/ | \
1171
+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
1173
+ srcdiroption="--srcdir=$${topdir}/libada"; \
1174
+ libsrcdir="$$s/libada"; \
1175
+ $(SHELL) $${libsrcdir}/configure \
1176
+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
1177
+ --target=${target_alias} $${srcdiroption} \
1185
+.PHONY: all-libada maybe-all-libada
1188
+all-libada: stage_current
1189
+@endif gcc-bootstrap
1192
+maybe-all-libada: all-libada
1193
+all-libada: configure-libada
1194
+ @: $(MAKE); $(unstage)
1195
+ @r=`${PWD_COMMAND}`; export r; \
1196
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1198
+ (cd $(HOST_SUBDIR)/libada && \
1199
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \
1206
+.PHONY: check-libada maybe-check-libada
1207
+maybe-check-libada:
1209
+maybe-check-libada: check-libada
1215
+.PHONY: install-libada maybe-install-libada
1216
+maybe-install-libada:
1218
+maybe-install-libada: install-libada
1224
+.PHONY: install-strip-libada maybe-install-strip-libada
1225
+maybe-install-strip-libada:
1227
+maybe-install-strip-libada: install-strip-libada
1229
+install-strip-libada:
1233
+# Other targets (info, dvi, pdf, etc.)
1235
+.PHONY: maybe-info-libada info-libada
1238
+maybe-info-libada: info-libada
1240
+# libada doesn't support info.
1245
+.PHONY: maybe-dvi-libada dvi-libada
1248
+maybe-dvi-libada: dvi-libada
1250
+# libada doesn't support dvi.
1255
+.PHONY: maybe-pdf-libada pdf-libada
1258
+maybe-pdf-libada: pdf-libada
1262
+ @: $(MAKE); $(unstage)
1263
+ @[ -f ./libada/Makefile ] || exit 0; \
1264
+ r=`${PWD_COMMAND}`; export r; \
1265
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1267
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1268
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1270
+ echo "Doing pdf in libada" ; \
1271
+ (cd $(HOST_SUBDIR)/libada && \
1272
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1273
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1274
+ "RANLIB=$${RANLIB}" \
1275
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1281
+.PHONY: maybe-html-libada html-libada
1284
+maybe-html-libada: html-libada
1286
+# libada doesn't support html.
1291
+.PHONY: maybe-TAGS-libada TAGS-libada
1294
+maybe-TAGS-libada: TAGS-libada
1296
+# libada doesn't support TAGS.
1301
+.PHONY: maybe-install-info-libada install-info-libada
1302
+maybe-install-info-libada:
1304
+maybe-install-info-libada: install-info-libada
1306
+# libada doesn't support install-info.
1307
+install-info-libada:
1311
+.PHONY: maybe-install-pdf-libada install-pdf-libada
1312
+maybe-install-pdf-libada:
1314
+maybe-install-pdf-libada: install-pdf-libada
1316
+install-pdf-libada: \
1317
+ configure-libada \
1319
+ @: $(MAKE); $(unstage)
1320
+ @[ -f ./libada/Makefile ] || exit 0; \
1321
+ r=`${PWD_COMMAND}`; export r; \
1322
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1324
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1325
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1327
+ echo "Doing install-pdf in libada" ; \
1328
+ (cd $(HOST_SUBDIR)/libada && \
1329
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1330
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1331
+ "RANLIB=$${RANLIB}" \
1332
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1338
+.PHONY: maybe-install-html-libada install-html-libada
1339
+maybe-install-html-libada:
1341
+maybe-install-html-libada: install-html-libada
1343
+install-html-libada: \
1344
+ configure-libada \
1346
+ @: $(MAKE); $(unstage)
1347
+ @[ -f ./libada/Makefile ] || exit 0; \
1348
+ r=`${PWD_COMMAND}`; export r; \
1349
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1351
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1352
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1354
+ echo "Doing install-html in libada" ; \
1355
+ (cd $(HOST_SUBDIR)/libada && \
1356
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1357
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1358
+ "RANLIB=$${RANLIB}" \
1359
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1365
+.PHONY: maybe-installcheck-libada installcheck-libada
1366
+maybe-installcheck-libada:
1368
+maybe-installcheck-libada: installcheck-libada
1370
+# libada doesn't support installcheck.
1371
+installcheck-libada:
1375
+.PHONY: maybe-mostlyclean-libada mostlyclean-libada
1376
+maybe-mostlyclean-libada:
1378
+maybe-mostlyclean-libada: mostlyclean-libada
1380
+mostlyclean-libada:
1381
+ @: $(MAKE); $(unstage)
1382
+ @[ -f ./libada/Makefile ] || exit 0; \
1383
+ r=`${PWD_COMMAND}`; export r; \
1384
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1386
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1387
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1389
+ echo "Doing mostlyclean in libada" ; \
1390
+ (cd $(HOST_SUBDIR)/libada && \
1391
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1392
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1393
+ "RANLIB=$${RANLIB}" \
1394
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1400
+.PHONY: maybe-clean-libada clean-libada
1401
+maybe-clean-libada:
1403
+maybe-clean-libada: clean-libada
1406
+ @: $(MAKE); $(unstage)
1407
+ @[ -f ./libada/Makefile ] || exit 0; \
1408
+ r=`${PWD_COMMAND}`; export r; \
1409
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1411
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1412
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1414
+ echo "Doing clean in libada" ; \
1415
+ (cd $(HOST_SUBDIR)/libada && \
1416
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1417
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1418
+ "RANLIB=$${RANLIB}" \
1419
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1425
+.PHONY: maybe-distclean-libada distclean-libada
1426
+maybe-distclean-libada:
1428
+maybe-distclean-libada: distclean-libada
1431
+ @: $(MAKE); $(unstage)
1432
+ @[ -f ./libada/Makefile ] || exit 0; \
1433
+ r=`${PWD_COMMAND}`; export r; \
1434
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1436
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1437
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1439
+ echo "Doing distclean in libada" ; \
1440
+ (cd $(HOST_SUBDIR)/libada && \
1441
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1442
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1443
+ "RANLIB=$${RANLIB}" \
1444
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1450
+.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada
1451
+maybe-maintainer-clean-libada:
1453
+maybe-maintainer-clean-libada: maintainer-clean-libada
1455
+maintainer-clean-libada:
1456
+ @: $(MAKE); $(unstage)
1457
+ @[ -f ./libada/Makefile ] || exit 0; \
1458
+ r=`${PWD_COMMAND}`; export r; \
1459
+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1461
+ for flag in $(EXTRA_HOST_FLAGS) ; do \
1462
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1464
+ echo "Doing maintainer-clean in libada" ; \
1465
+ (cd $(HOST_SUBDIR)/libada && \
1466
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1467
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1468
+ "RANLIB=$${RANLIB}" \
1469
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1470
+ maintainer-clean) \
1477
.PHONY: configure-gnattools maybe-configure-gnattools
1478
maybe-configure-gnattools:
1480
@@ -29482,12 +29826,6 @@
1481
maybe-check-gnattools: check-gnattools
1484
- @: $(MAKE); $(unstage)
1485
- @r=`${PWD_COMMAND}`; export r; \
1486
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1488
- (cd $(HOST_SUBDIR)/gnattools && \
1489
- $(MAKE) $(FLAGS_TO_PASS) check)
1493
@@ -29528,24 +29866,8 @@
1495
maybe-info-gnattools: info-gnattools
1498
- configure-gnattools
1499
- @: $(MAKE); $(unstage)
1500
- @[ -f ./gnattools/Makefile ] || exit 0; \
1501
- r=`${PWD_COMMAND}`; export r; \
1502
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1504
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1505
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1507
- echo "Doing info in gnattools" ; \
1508
- (cd $(HOST_SUBDIR)/gnattools && \
1509
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1510
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1511
- "RANLIB=$${RANLIB}" \
1512
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1515
+# gnattools doesn't support info.
1520
@@ -29554,24 +29876,8 @@
1522
maybe-dvi-gnattools: dvi-gnattools
1525
- configure-gnattools
1526
- @: $(MAKE); $(unstage)
1527
- @[ -f ./gnattools/Makefile ] || exit 0; \
1528
- r=`${PWD_COMMAND}`; export r; \
1529
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1531
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1532
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1534
- echo "Doing dvi in gnattools" ; \
1535
- (cd $(HOST_SUBDIR)/gnattools && \
1536
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1537
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1538
- "RANLIB=$${RANLIB}" \
1539
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1542
+# gnattools doesn't support dvi.
1547
@@ -29606,24 +29912,8 @@
1549
maybe-html-gnattools: html-gnattools
1552
- configure-gnattools
1553
- @: $(MAKE); $(unstage)
1554
- @[ -f ./gnattools/Makefile ] || exit 0; \
1555
- r=`${PWD_COMMAND}`; export r; \
1556
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1558
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1559
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1561
- echo "Doing html in gnattools" ; \
1562
- (cd $(HOST_SUBDIR)/gnattools && \
1563
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1564
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1565
- "RANLIB=$${RANLIB}" \
1566
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1569
+# gnattools doesn't support html.
1574
@@ -29632,24 +29922,8 @@
1576
maybe-TAGS-gnattools: TAGS-gnattools
1579
- configure-gnattools
1580
- @: $(MAKE); $(unstage)
1581
- @[ -f ./gnattools/Makefile ] || exit 0; \
1582
- r=`${PWD_COMMAND}`; export r; \
1583
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1585
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1586
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1588
- echo "Doing TAGS in gnattools" ; \
1589
- (cd $(HOST_SUBDIR)/gnattools && \
1590
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1591
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1592
- "RANLIB=$${RANLIB}" \
1593
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1596
+# gnattools doesn't support TAGS.
1601
@@ -29658,25 +29932,8 @@
1603
maybe-install-info-gnattools: install-info-gnattools
1605
-install-info-gnattools: \
1606
- configure-gnattools \
1608
- @: $(MAKE); $(unstage)
1609
- @[ -f ./gnattools/Makefile ] || exit 0; \
1610
- r=`${PWD_COMMAND}`; export r; \
1611
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1613
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1614
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1616
- echo "Doing install-info in gnattools" ; \
1617
- (cd $(HOST_SUBDIR)/gnattools && \
1618
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1619
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1620
- "RANLIB=$${RANLIB}" \
1621
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1624
+# gnattools doesn't support install-info.
1625
+install-info-gnattools:
1629
@@ -29739,24 +29996,8 @@
1631
maybe-installcheck-gnattools: installcheck-gnattools
1633
-installcheck-gnattools: \
1634
- configure-gnattools
1635
- @: $(MAKE); $(unstage)
1636
- @[ -f ./gnattools/Makefile ] || exit 0; \
1637
- r=`${PWD_COMMAND}`; export r; \
1638
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1640
- for flag in $(EXTRA_HOST_FLAGS) ; do \
1641
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1643
- echo "Doing installcheck in gnattools" ; \
1644
- (cd $(HOST_SUBDIR)/gnattools && \
1645
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1646
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1647
- "RANLIB=$${RANLIB}" \
1648
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1651
+# gnattools doesn't support installcheck.
1652
+installcheck-gnattools:
1656
@@ -40980,13 +41221,8 @@
1658
maybe-check-target-libada: check-target-libada
1660
+# Dummy target for uncheckable module.
1661
check-target-libada:
1662
- @: $(MAKE); $(unstage)
1663
- @r=`${PWD_COMMAND}`; export r; \
1664
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1665
- $(NORMAL_TARGET_EXPORTS) \
1666
- (cd $(TARGET_SUBDIR)/libada && \
1667
- $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
1669
@endif target-libada
1671
@@ -40995,13 +41231,8 @@
1673
maybe-install-target-libada: install-target-libada
1675
-install-target-libada: installdirs
1676
- @: $(MAKE); $(unstage)
1677
- @r=`${PWD_COMMAND}`; export r; \
1678
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1679
- $(NORMAL_TARGET_EXPORTS) \
1680
- (cd $(TARGET_SUBDIR)/libada && \
1681
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
1682
+# Dummy target for uninstallable.
1683
+install-target-libada:
1685
@endif target-libada
1687
@@ -41010,13 +41241,8 @@
1689
maybe-install-strip-target-libada: install-strip-target-libada
1691
-install-strip-target-libada: installdirs
1692
- @: $(MAKE); $(unstage)
1693
- @r=`${PWD_COMMAND}`; export r; \
1694
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1695
- $(NORMAL_TARGET_EXPORTS) \
1696
- (cd $(TARGET_SUBDIR)/libada && \
1697
- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
1698
+# Dummy target for uninstallable.
1699
+install-strip-target-libada:
1701
@endif target-libada
1703
@@ -41027,24 +41253,8 @@
1705
maybe-info-target-libada: info-target-libada
1707
-info-target-libada: \
1708
- configure-target-libada
1709
- @: $(MAKE); $(unstage)
1710
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1711
- r=`${PWD_COMMAND}`; export r; \
1712
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1713
- $(NORMAL_TARGET_EXPORTS) \
1714
- echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
1715
- for flag in $(EXTRA_TARGET_FLAGS); do \
1716
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1718
- (cd $(TARGET_SUBDIR)/libada && \
1719
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1720
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1721
- "RANLIB=$${RANLIB}" \
1722
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1725
+# libada doesn't support info.
1726
+info-target-libada:
1728
@endif target-libada
1730
@@ -41053,24 +41263,8 @@
1732
maybe-dvi-target-libada: dvi-target-libada
1734
-dvi-target-libada: \
1735
- configure-target-libada
1736
- @: $(MAKE); $(unstage)
1737
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1738
- r=`${PWD_COMMAND}`; export r; \
1739
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1740
- $(NORMAL_TARGET_EXPORTS) \
1741
- echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
1742
- for flag in $(EXTRA_TARGET_FLAGS); do \
1743
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1745
- (cd $(TARGET_SUBDIR)/libada && \
1746
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1747
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1748
- "RANLIB=$${RANLIB}" \
1749
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1752
+# libada doesn't support dvi.
1755
@endif target-libada
1757
@@ -41105,24 +41299,8 @@
1759
maybe-html-target-libada: html-target-libada
1761
-html-target-libada: \
1762
- configure-target-libada
1763
- @: $(MAKE); $(unstage)
1764
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1765
- r=`${PWD_COMMAND}`; export r; \
1766
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1767
- $(NORMAL_TARGET_EXPORTS) \
1768
- echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
1769
- for flag in $(EXTRA_TARGET_FLAGS); do \
1770
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1772
- (cd $(TARGET_SUBDIR)/libada && \
1773
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1774
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1775
- "RANLIB=$${RANLIB}" \
1776
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1779
+# libada doesn't support html.
1780
+html-target-libada:
1782
@endif target-libada
1784
@@ -41131,24 +41309,8 @@
1786
maybe-TAGS-target-libada: TAGS-target-libada
1788
-TAGS-target-libada: \
1789
- configure-target-libada
1790
- @: $(MAKE); $(unstage)
1791
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1792
- r=`${PWD_COMMAND}`; export r; \
1793
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1794
- $(NORMAL_TARGET_EXPORTS) \
1795
- echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
1796
- for flag in $(EXTRA_TARGET_FLAGS); do \
1797
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1799
- (cd $(TARGET_SUBDIR)/libada && \
1800
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1801
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1802
- "RANLIB=$${RANLIB}" \
1803
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1806
+# libada doesn't support TAGS.
1807
+TAGS-target-libada:
1809
@endif target-libada
1811
@@ -41157,25 +41319,8 @@
1813
maybe-install-info-target-libada: install-info-target-libada
1815
-install-info-target-libada: \
1816
- configure-target-libada \
1817
- info-target-libada
1818
- @: $(MAKE); $(unstage)
1819
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1820
- r=`${PWD_COMMAND}`; export r; \
1821
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1822
- $(NORMAL_TARGET_EXPORTS) \
1823
- echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
1824
- for flag in $(EXTRA_TARGET_FLAGS); do \
1825
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1827
- (cd $(TARGET_SUBDIR)/libada && \
1828
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1829
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1830
- "RANLIB=$${RANLIB}" \
1831
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1834
+# libada doesn't support install-info.
1835
+install-info-target-libada:
1837
@endif target-libada
1839
@@ -41238,24 +41383,8 @@
1841
maybe-installcheck-target-libada: installcheck-target-libada
1843
-installcheck-target-libada: \
1844
- configure-target-libada
1845
- @: $(MAKE); $(unstage)
1846
- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
1847
- r=`${PWD_COMMAND}`; export r; \
1848
- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
1849
- $(NORMAL_TARGET_EXPORTS) \
1850
- echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
1851
- for flag in $(EXTRA_TARGET_FLAGS); do \
1852
- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
1854
- (cd $(TARGET_SUBDIR)/libada && \
1855
- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
1856
- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
1857
- "RANLIB=$${RANLIB}" \
1858
- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
1861
+# libada doesn't support installcheck.
1862
+installcheck-target-libada:
1864
@endif target-libada
1866
@@ -45739,7 +45868,7 @@
1867
all-stageprofile-libcpp: maybe-all-stageprofile-intl
1868
all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
1869
all-fixincludes: maybe-all-libiberty
1870
-all-gnattools: maybe-all-target-libada
1871
+all-gnattools: maybe-all-libada
1872
all-lto-plugin: maybe-all-libiberty
1874
all-stage1-lto-plugin: maybe-all-stage1-libiberty
1875
Index: b/src/configure.ac
1876
===================================================================
1877
--- a/src/configure.ac
1878
+++ b/src/configure.ac
1881
# these libraries are used by various programs built for the host environment
1883
-host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv"
1884
+host_libs="intl libiberty opcodes bfd readline tcl tk itcl libgui zlib libbacktrace libcpp libdecnumber gmp mpfr mpc isl cloog libelf libiconv libada"
1886
# these tools are built for the host environment
1887
# Note, the powerpc-eabi build depends on sim occurring before gdb in order to
1890
# Some are only suitable for cross toolchains.
1891
# Remove these if host=target.
1892
-cross_only="target-libgloss target-newlib target-opcodes"
1893
+cross_only="target-libgloss target-newlib target-opcodes target-libada"
1895
case $is_cross_compiler in
1896
no) skipdirs="${skipdirs} ${cross_only}" ;;
added
removed
.svn/pristine/3d/3d2773e9758d6e6b7e6e30254422bb999fbd9a60.svn-base
