Il 20/08/2013 15:59, Tom Tromey ha scritto:
> This adds the configury needed for automatic dependency tracking. It
> also adds some bits to the Makefile so we can begin converting
> (removing) explicit dependencies.
>
> * Makefile.in (CCDEPMODE, DEPDIR, depcomp, COMPILE.base)
> (COMPILE, POSTCOMPILE): New variables.
> (.cc.o .c.o): Use COMPILE, POSTCOMPILE.
> (DEPFILES): New variable.
> Include ".Po" files.
> * configure.ac: Add checks for dependency checking.
> * configure, aclocal.m4: Regenerate.
> ---
> gcc/Makefile.in | 28 ++++++++++-
> gcc/aclocal.m4 | 2 +
> gcc/configure | 148
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> gcc/configure.ac | 16 ++++++
> 4 files changed, 191 insertions(+), 3 deletions(-)
>
> diff --git a/gcc/Makefile.in b/gcc/Makefile.in
> index 172ab4d..e1de7ba 100644
> --- a/gcc/Makefile.in
> +++ b/gcc/Makefile.in
> @@ -308,6 +308,11 @@ write_entries_to_file = $(shell rm -f $(2) || :) $(shell
> touch $(2)) \
> # UNSORTED
> # --------
>
> +# Dependency tracking stuff.
> +CCDEPMODE = @CCDEPMODE@
> +DEPDIR = @DEPDIR@
> +depcomp = $(SHELL) $(srcdir)/../depcomp
> +
> # Some compilers can't handle cc -c blah.c -o foo/blah.o.
> # In stage2 and beyond, we force this to "-o $@" since we know we're using
> gcc.
> OUTPUT_OPTION = @OUTPUT_OPTION@
> @@ -1068,8 +1073,19 @@ INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \
> $(CPPINC) $(GMPINC) $(DECNUMINC) $(BACKTRACEINC) \
> $(CLOOGINC) $(ISLINC)
>
> +COMPILE.base = $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) -o $@
> +ifeq ($(CCDEPMODE),depmode=gcc3)
> +COMPILE = $(COMPILE.base) -MT $@ -MMD -MP -MF $(*D)/$(DEPDIR)/$(*F).TPo
> +POSTCOMPILE = @mv $(*D)/$(DEPDIR)/$(*F).TPo $(*D)/$(DEPDIR)/$(*F).Po
> +else
> +COMPILE = source='$<' object='$@' libtool=no \
> + DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) $(COMPILE.base)
> +POSTCOMPILE =
> +endif
> +
> .cc.o .c.o:
> - $(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $< $(OUTPUT_OPTION)
> + $(COMPILE) $<
> + $(POSTCOMPILE)
>
> #
> # Support for additional languages (other than C).
> @@ -5378,7 +5394,17 @@ po/gcc.pot: force
> AWK=$(AWK) $(SHELL) $(srcdir)/po/exgettext \
> $(XGETTEXT) gcc $(srcdir)
>
> +#
> +
> +# Dependency information.
> +
> # In order for parallel make to really start compiling the expensive
> # objects from $(OBJS) as early as possible, build all their
> # prerequisites strictly before all objects.
> $(ALL_HOST_OBJS) : | $(generated_files)
> +
> +# Include the auto-generated dependencies for all host objects.
> +DEPFILES = \
> + $(foreach obj,$(ALL_HOST_OBJS),\
> + $(dir $(obj))$(DEPDIR)/$(patsubst %.o,%.Po,$(notdir $(obj))))
> +-include $(DEPFILES)
> diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
> index 1f3ce9d..e7cfd7d 100644
> --- a/gcc/aclocal.m4
> +++ b/gcc/aclocal.m4
> @@ -101,10 +101,12 @@ m4_define([AC_PROG_CC],
>
> m4_include([../config/acx.m4])
> m4_include([../config/codeset.m4])
> +m4_include([../config/depstand.m4])
> m4_include([../config/dfp.m4])
> m4_include([../config/gettext-sister.m4])
> m4_include([../config/iconv.m4])
> m4_include([../config/lcmessage.m4])
> +m4_include([../config/lead-dot.m4])
> m4_include([../config/lib-ld.m4])
> m4_include([../config/lib-link.m4])
> m4_include([../config/lib-prefix.m4])
> diff --git a/gcc/configure b/gcc/configure
> index 1e9be8e..c53a930 100755
> --- a/gcc/configure
> +++ b/gcc/configure
> @@ -735,6 +735,9 @@ LDEXP_LIB
> EXTRA_GCC_LIBS
> GNAT_LIBEXC
> COLLECT2_LIBS
> +CCDEPMODE
> +DEPDIR
> +am__leading_dot
> CXXCPP
> AR
> NM
> @@ -8873,6 +8876,136 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
>
>
> # --------
> +# Dependency checking.
> +# --------
> +
> +ac_ext=cpp
> +ac_cpp='$CXXCPP $CPPFLAGS'
> +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS
> conftest.$ac_ext $LIBS >&5'
> +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
> +
> +rm -rf .tst 2>/dev/null
> +mkdir .tst 2>/dev/null
> +if test -d .tst; then
> + am__leading_dot=.
> +else
> + am__leading_dot=_
> +fi
> +rmdir .tst 2>/dev/null
> +
> +DEPDIR="${am__leading_dot}deps"
> +
> +ac_config_commands="$ac_config_commands depdir"
> +
> +
> +ac_config_commands="$ac_config_commands gccdepdir"
> +
> +
> +depcc="$CC" am_compiler_list=
> +
> +am_depcomp=$ac_aux_dir/depcomp
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of
> $depcc" >&5
> +$as_echo_n "checking dependency style of $depcc... " >&6; }
> +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
> + $as_echo_n "(cached) " >&6
> +else
> + if test -f "$am_depcomp"; then
> + # We make a subdir and do the tests there. Otherwise we can end up
> + # making bogus files that we don't know about and never remove. For
> + # instance it was reported that on HP-UX the gcc test will end up
> + # making a dummy file named `D' -- because `-MD' means `put the output
> + # in D'.
> + mkdir conftest.dir
> + # Copy depcomp to subdir because otherwise we won't find it if we're
> + # using a relative directory.
> + cp "$am_depcomp" conftest.dir
> + cd conftest.dir
> + # We will build objects and dependencies in a subdirectory because
> + # it helps to detect inapplicable dependency modes. For instance
> + # both Tru64's cc and ICC support -MD to output dependencies as a
> + # side effect of compilation, but ICC will put the dependencies in
> + # the current directory while Tru64 will put them in the object
> + # directory.
> + mkdir sub
> +
> + am_cv_CC_dependencies_compiler_type=none
> + if test "$am_compiler_list" = ""; then
> + am_compiler_list=`sed -n 's/^\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
> + fi
> + for depmode in $am_compiler_list; do
> + if test $depmode = none; then break; fi
> +
> + $as_echo "$as_me:$LINENO: trying $depmode" >&5
> + # Setup a source with many dependencies, because some compilers
> + # like to wrap large dependency lists on column 80 (with \), and
> + # we should not choose a depcomp mode which is confused by this.
> + #
> + # We need to recreate these files for each test, as the compiler may
> + # overwrite some of them when testing with obscure command lines.
> + # This happens at least with the AIX C compiler.
> + : > sub/conftest.c
> + for i in 1 2 3 4 5 6; do
> + echo '#include "conftst'$i'.h"' >> sub/conftest.c
> + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
> + # Solaris 8's {/usr,}/bin/sh.
> + touch sub/conftst$i.h
> + done
> + echo "include sub/conftest.Po" > confmf
> +
> + # We check with `-c' and `-o' for the sake of the "dashmstdout"
> + # mode. It turns out that the SunPro C++ compiler does not properly
> + # handle `-M -o', and we need to detect this.
> + depcmd="depmode=$depmode \
> + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
> + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
> + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c"
> + echo "| $depcmd" | sed -e 's/ */ /g' >&5
> + if env $depcmd > conftest.err 2>&1 &&
> + grep sub/conftst6.h sub/conftest.Po >>conftest.err 2>&1 &&
> + grep sub/conftest.${OBJEXT-o} sub/conftest.Po >>conftest.err 2>&1 &&
> + ${MAKE-make} -s -f confmf >>conftest.err 2>&1; then
> + # icc doesn't choke on unknown options, it will just issue warnings
> + # or remarks (even with -Werror). So we grep stderr for any message
> + # that says an option was ignored or not supported.
> + # When given -MP, icc 7.0 and 7.1 complain thusly:
> + # icc: Command line warning: ignoring option '-M'; no argument
> required
> + # The diagnosis changed in icc 8.0:
> + # icc: Command line remark: option '-MP' not supported
> + if (grep 'ignoring option' conftest.err ||
> + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
> + am_cv_CC_dependencies_compiler_type=$depmode
> + $as_echo "$as_me:$LINENO: success" >&5
> + break
> + fi
> + fi
> + $as_echo "$as_me:$LINENO: failure, diagnostics are:" >&5
> + sed -e 's/^/| /' < conftest.err >&5
> + done
> +
> + cd ..
> + rm -rf conftest.dir
> +else
> + am_cv_CC_dependencies_compiler_type=none
> +fi
> +
> +fi
> +{ $as_echo "$as_me:${as_lineno-$LINENO}: result:
> $am_cv_CC_dependencies_compiler_type" >&5
> +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
> +if test x${am_cv_CC_dependencies_compiler_type-none} = xnone
> +then as_fn_error "no usable dependency style found" "$LINENO" 5
> +else CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
> +
> +fi
> +
> +ac_ext=c
> +ac_cpp='$CPP $CPPFLAGS'
> +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
> +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS
> conftest.$ac_ext $LIBS >&5'
> +ac_compiler_gnu=$ac_cv_c_compiler_gnu
> +
> +
> +# --------
> # UNSORTED
> # --------
>
> @@ -17894,7 +18027,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 17897 "configure"
> +#line 18030 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -18000,7 +18133,7 @@ else
> lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
> lt_status=$lt_dlunknown
> cat > conftest.$ac_ext <<_LT_EOF
> -#line 18003 "configure"
> +#line 18136 "configure"
> #include "confdefs.h"
>
> #if HAVE_DLFCN_H
> @@ -28426,6 +28559,8 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
> #
> # INIT-COMMANDS
> #
> +ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR
> +subdirs="$subdirs" ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR
> subdirs='$subdirs'
>
> _ACEOF
> @@ -28437,6 +28572,8 @@ for ac_config_target in $ac_config_targets
> do
> case $ac_config_target in
> "auto-host.h") CONFIG_HEADERS="$CONFIG_HEADERS auto-host.h:config.in" ;;
> + "depdir") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir" ;;
> + "gccdepdir") CONFIG_COMMANDS="$CONFIG_COMMANDS gccdepdir" ;;
> "as") CONFIG_FILES="$CONFIG_FILES as:exec-tool.in" ;;
> "collect-ld") CONFIG_FILES="$CONFIG_FILES collect-ld:exec-tool.in" ;;
> "nm") CONFIG_FILES="$CONFIG_FILES nm:exec-tool.in" ;;
> @@ -29020,6 +29157,13 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
>
>
> case $ac_file$ac_mode in
> + "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;;
> + "gccdepdir":C)
> + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs build/$DEPDIR
> + for lang in $subdirs c-family common
> + do
> + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs $lang/$DEPDIR
> + done ;;
> "as":F) chmod +x as ;;
> "collect-ld":F) chmod +x collect-ld ;;
> "nm":F) chmod +x nm ;;
> diff --git a/gcc/configure.ac b/gcc/configure.ac
> index 116ba13..eeb1b0f 100644
> --- a/gcc/configure.ac
> +++ b/gcc/configure.ac
> @@ -972,6 +972,22 @@ AC_CHECK_HEADERS(ext/hash_map)
> AC_LANG_POP(C++)
>
> # --------
> +# Dependency checking.
> +# --------
> +
> +AC_LANG_PUSH(C++)
> +ZW_CREATE_DEPDIR
> +AC_CONFIG_COMMANDS([gccdepdir],[
> + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs build/$DEPDIR
> + for lang in $subdirs c-family common
> + do
> + ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/mkinstalldirs $lang/$DEPDIR
> + done], [subdirs="$subdirs" ac_aux_dir=$ac_aux_dir DEPDIR=$DEPDIR])
> +
> +ZW_PROG_COMPILER_DEPENDENCIES([CC])
> +AC_LANG_POP(C++)
> +
> +# --------
> # UNSORTED
> # --------
>
>
Ok.
Paolo
