Arnaud Charlet wrote:
Yes I volunteer. We're in stage1 so we have some time to sort out
reported issues before release.
OK. I'm still concerned that there is no simple fallback for all targets
that will break, except for --disable-multilib which is too strong since
it impacts other languages.
I'd be much more confortable with e.g. adding a --disable-mutilibada
or some such that would basically fall back to the previous state.
I volunteer to check if there is support for
--enable-multilib=libstdc++-v3,libjava and if not add it.
Unfortunately, --disable-multilib=ada cannot work (because --disable-xxx
is the same as --enable-multilib=no).
As an alternative, people that don't want multilibbed libada can not use
libada altogether. More on this in a second.
Only libada/Makefile.in install will be invoked for all multilib
by the install machinery so gcc/ada/Makefile.in install cannot
do properly the rts install work anymore, hence the change. The relevant
libada/Makefile.in parts are now:
What about people using disable-multilib or --disable-libada ? I'd rather
keep the part in ada/Makefile.in for these cases.
Note that Laurent commented out install-gnatlib in ada/Make-lang.in. I
agree though that it doesn't hurt to keep those targets, and I think
that this hunk should not be included.
Well, I still do not understand how install-gnatlib works in the new scheme,
I guess I need more detailed explanation, since I am not familiar with
multilib scheme. Could you explain in details how make install will install
the various gnatlibs in the new scheme ?
I guess everything will be more clear after the above:
gcc/ada/Makefile.in is not changed, and both gcc/ada/Make-lang.in (once
Laurent undoes that hunk) and libada/Makefile.in invoke it.
The difference introduced by multilibbing is just a few lines like these:
+ $(MULTIDO) DO=all multi-do # $(MAKE)
+ $(MULTIDO) DO=install multi-do # $(MAKE)
When multilibbing is disabled, MULTIDO=: and these lines is a no-op.
When it is enabled, MULTIDO=$(MAKE) and they cause one recursive make
invocation for each multilib (for example libada/32/Makefile). The
multilibs differ in the default values of CFLAGS, and they know about
this difference via another variable, MULTISUBDIR (which is for example
/32 for libada/32/Makefile). This is what Laurent uses to
conditionalize the PAIRS in gcc/ada/Makefile.in.
Review of the patch follows:
- -if [ -f gnat1$(exeext) ] ; \
- then \
- $(MAKE) $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib; \
- fi
+# -if [ -f gnat1$(exeext) ] ; \
+# then \
+# $(MAKE) $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib; \
+# fi
-install-gnatlib:
- $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)
install-gnatlib$(LIBGNAT_TARGET)
+#install-gnatlib:
+# $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)
install-gnatlib$(LIBGNAT_TARGET)
+#
+#install-gnatlib-obj:
+# $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib-obj
-install-gnatlib-obj:
- $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib-obj
-
ada.install-man:
Revert as asked by Arnaud.
+ifeq ($(strip $(filter-out %x86_64 linux%,$(arch) $(osys))),)
+ ifeq ($(strip $(MULTISUBDIR)),/32)
+ arch:=i686
+ endif
+endif
Just $(filter-out %x86_64, $(arch)). No need to check for linux too,
the /32 multilib name is pretty common.
The same should be enough for both powerpc64 and sparc64.
Index: libada/configure
Don't include regenerated files in the patch, only in the ChangeLog. :-)
+# GNU Make needs to see an explicit $(MAKE) variable in the command it
+# runs to enable its job server during parallel builds. Hence the
+# comments below.
+
+all-multi:
+ $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do # $(MAKE)
+install-multi:
+ $(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do # $(MAKE)
+
+.PHONY: all-multi install-multi
+
+
+mostlyclean-multi:
+ $(MULTICLEAN) $(AM_MAKEFLAGS) DO=mostlyclean multi-clean # $(MAKE)
+clean-multi:
+ $(MULTICLEAN) $(AM_MAKEFLAGS) DO=clean multi-clean # $(MAKE)
+distclean-multi:
+ $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
+maintainer-clean-multi:
+ $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
+
+.PHONY: mostlyclean-multi clean-multi distclean-multi maintainer-clean-multi
+
+install-exec-am: install-multi
+## No uninstall rule?
+
+
+## These cleaning rules are recursive. They should not be
+## registered as dependencies of *-am rules. For instance
+## otherwise running `make clean' would cause both
+## clean-multi and mostlyclean-multi to be run, while only
+## clean-multi is really expected (since clean-multi recursively
+## call clean, it already do the job of mostlyclean).
+mostlyclean: mostlyclean-multi
+clean: clean-multi
+distclean: distclean-multi
+maintainer-clean: maintainer-clean-multi
Not needed.
+ libsubdir="$(libsubdir)" \
Does it work to put this in LIBADA_FLAGS_TO_PASS now?
Index: libada/configure.ac
===================================================================
--- libada/configure.ac (revision 138006)
+++ libada/configure.ac (working copy)
@@ -49,6 +49,53 @@
[MAINT='#'])
AC_SUBST([MAINT])dnl
+AC_CANONICAL_SYSTEM
+target_alias=${target_alias-$host_alias}
+
+AM_ENABLE_MULTILIB(, ..)
+# Calculate toolexeclibdir
+# Also toolexecdir, though it's only used in toolexeclibdir
+case ${enable_version_specific_runtime_libs} in
+ yes)
+ # Need the gcc compiler version to know where to install libraries
+ # and header files if --enable-version-specific-runtime-libs option
+ # is selected.
+ toolexecdir='$(libdir)/gcc/$(target_alias)'
+ toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
+ ;;
+ no)
+ if test -n "$with_cross_host" &&
+ test x"$with_cross_host" != x"no"; then
+ # Install a library built with a cross compiler in tooldir, not libdir.
+ toolexecdir='$(exec_prefix)/$(target_alias)'
+ toolexeclibdir='$(toolexecdir)/lib'
+ else
+ toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
+ toolexeclibdir='$(libdir)'
+ fi
+ multi_os_directory=`$CC -print-multi-os-directory`
+ case $multi_os_directory in
+ .) ;; # Avoid trailing /.
+ *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
+ esac
+ ;;
+esac
+AC_SUBST(toolexecdir)
+AC_SUBST(toolexeclibdir)
Please add a TODO item that toolexeclibdir is currently disregarded.
Paolo
