[PATCH] Fixes combined gcc-binutils builds.
Michael Darling
darlingm@gmail.com
Fri Jul 17 00:47:00 GMT 2015
Ping. I don't have write access.
**Updated patch ATTACHED**, modified so the commits during the past
two months don't cause conflicts. Minor other updating (i.e. Likewise
rather than repeating in ChangeLogs.)
Binutils **updated patch also ATTACHED** from May 24, also modified
so its commits during past two months don't conflict.
On Sun, May 24, 2015 at 3:56 PM, Michael Darling <darlingm@gmail.com> wrote:
> Combined builds has been broken for about 10 months, because some
> binutils configure.in files were renamed to configure.ac, but gcc's
> references to them were not updated. There is a corresponding patch
> submitted to binutils-gdb, which renames its few remaining configure.in
> files to configure.ac. Otherwise, fixing the gcc calls to binutils-gdb
> configure.* files would be more complicated.
>
> Also, some time ago, gcc renamed its configure.in files to configure.ac.
> Fixed a few remaining references to gcc configure.in files, such as in
> error messages and documentation.
>
> See PR gcc/other/66259 and binutils-gdb/binutils/18450.
>
> Index: ChangeLog
> ===================================================================
> --- ChangeLog (revision 223630)
> +++ ChangeLog (working copy)
> @@ -1,3 +1,10 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * config-ml.in: Reflects renaming of configure.in to configure.ac
> + * configure: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-16 James Bowman <james.bowman@ftdichip.com>
>
> * configure.ac: FT32 target added.
> Index: boehm-gc/ChangeLog
> ===================================================================
> --- boehm-gc/ChangeLog (revision 223630)
> +++ boehm-gc/ChangeLog (working copy)
> @@ -1,3 +1,11 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * Makefile.direct: Reflects renaming of configure.in to configure.ac
> + * Makefile.dist: Reflects renaming of configure.in to configure.ac
> + * version.h: Reflects renaming of configure.in to configure.ac
> + * doc/README: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
>
> * Makefile.in: Regenerated with automake-1.11.6.
> Index: boehm-gc/Makefile.direct
> ===================================================================
> --- boehm-gc/Makefile.direct (revision 223630)
> +++ boehm-gc/Makefile.direct (working copy)
> @@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.
> TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
> tests/leak_test.c tests/thread_leak_test.c tests/middle.c
>
> -GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
> +GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
> libtool.m4 install-sh configure.host Makefile.in \
> aclocal.m4 config.sub config.guess \
> include/Makefile.am include/Makefile.in \
> Index: boehm-gc/Makefile.dist
> ===================================================================
> --- boehm-gc/Makefile.dist (revision 223630)
> +++ boehm-gc/Makefile.dist (working copy)
> @@ -326,7 +326,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.
> TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
> tests/leak_test.c tests/thread_leak_test.c tests/middle.c
>
> -GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
> +GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
> libtool.m4 install-sh configure.host Makefile.in \
> aclocal.m4 config.sub config.guess \
> include/Makefile.am include/Makefile.in \
> Index: boehm-gc/doc/README
> ===================================================================
> --- boehm-gc/doc/README (revision 223630)
> +++ boehm-gc/doc/README (working copy)
> @@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Developmen
> The file linux_threads.c is also
> Copyright (c) 1998 by Fergus Henderson. All rights reserved.
>
> -The files Makefile.am, and configure.in are
> +The files Makefile.am, and configure.ac are
> Copyright (c) 2001 by Red Hat Inc. All rights reserved.
>
> Several files supporting GNU-style builds are copyrighted by the Free
> Index: boehm-gc/version.h
> ===================================================================
> --- boehm-gc/version.h (revision 223630)
> +++ boehm-gc/version.h (working copy)
> @@ -1,4 +1,4 @@
> -/* The version here should match that in configure/configure.in */
> +/* The version here should match that in configure/configure.ac */
> /* Eventually this one may become unnecessary. For now we need */
> /* it to keep the old-style build process working. */
> #define GC_TMP_VERSION_MAJOR 6
> @@ -14,7 +14,7 @@
> GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
> defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
> defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
> -# error Inconsistent version info. Check README, version.h, and
> configure.in.
> +# error Inconsistent version info. Check README, version.h, and
> configure.ac.
> # endif
> #else
> # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
> Index: config/ChangeLog
> ===================================================================
> --- config/ChangeLog (revision 223630)
> +++ config/ChangeLog (working copy)
> @@ -1,3 +1,11 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * gettext.m4: Reflects renaming of configure.in to configure.ac
> + * po.m4: Reflects renaming of configure.in to configure.ac
> + * stdint.m4: Reflects renaming of configure.in to configure.ac
> + * tcl.m4: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Eric Botcazou <ebotcazou@adacore.com>
>
> * sjlj.m4: New file.
> Index: config/gettext.m4
> ===================================================================
> --- config/gettext.m4 (revision 223630)
> +++ config/gettext.m4 (working copy)
> @@ -81,7 +81,7 @@ AC_DEFUN([AM_GNU_GETTEXT],
> dnl Ideally we would do this search only after the
> dnl if test "$USE_NLS" = "yes"; then
> dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
> - dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
> + dnl tests. But if configure.ac invokes AM_ICONV after AM_GNU_GETTEXT
> dnl the configure script would need to contain the same shell code
> dnl again, outside any 'if'. There are two solutions:
> dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
> @@ -303,7 +303,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngett
> AC_SUBST(USE_INCLUDED_LIBINTL)
> AC_SUBST(CATOBJEXT)
>
> - dnl For backward compatibility. Some configure.ins may be using this.
> + dnl For backward compatibility. Some configure.acs may be using this.
> nls_cv_header_intl=
> nls_cv_header_libgt=
>
> Index: config/po.m4
> ===================================================================
> --- config/po.m4 (revision 223630)
> +++ config/po.m4 (working copy)
> @@ -117,7 +117,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> @@ -124,7 +124,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> Index: config/stdint.m4
> ===================================================================
> --- config/stdint.m4 (revision 223630)
> +++ config/stdint.m4 (working copy)
> @@ -39,7 +39,7 @@ dnl If your installed header files require the std
> dnl create an installable file mylib-int.h that all your other installable
> dnl header may include. So, for a library package named "mylib", just use
> dnl GCC_HEADER_STDINT(mylib-int.h)
> -dnl in configure.in and install that header file in Makefile.am along with
> +dnl in configure.ac and install that header file in Makefile.am along with
> dnl the other headers (mylib.h). The mylib-specific headers can simply
> dnl use "#include <mylib-int.h>" to obtain the stdint-types.
> dnl
> Index: config/tcl.m4
> ===================================================================
> --- config/tcl.m4 (revision 223630)
> +++ config/tcl.m4 (working copy)
> @@ -2136,7 +2136,7 @@ dnl # preprocessing tests use only CPPFLAGS.
> INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE)
> $(LIB_INSTALL_DIR)/$(LIB_FILE) ; (cd $(LIB_INSTALL_DIR) ; $(RANLIB)
> $(LIB_FILE))'
> fi
>
> -dnl Not at all clear what this was doing in Tcl's configure.in
> +dnl Not at all clear what this was doing in Tcl's configure.ac
> dnl or why it was needed was needed. In any event, this sort of
> dnl things needs to be done in the big loop above.
> dnl REMOVE THIS BLOCK LATER! (mdejong)
> @@ -3235,7 +3235,7 @@ AC_DEFUN([SC_TCL_GETGRNAM_R], [AC_CHECK_FUNC(getgr
> # created. Accumulates.
> #
> # Requires presence of SC_OUTPUT_COMMANDS_PRE at the end
> -# of configure.in (right before AC_OUTPUT).
> +# of configure.ac (right before AC_OUTPUT).
> #
> #--------------------------------------------------------------------
>
> Index: config-ml.in
> ===================================================================
> --- config-ml.in (revision 223630)
> +++ config-ml.in (working copy)
> @@ -31,7 +31,7 @@
> # user select which libraries s/he really wants.
> #
> # Subdirectories wishing to use multilib should put the following lines
> -# in the "post-target" section of configure.in.
> +# in the "post-target" section of configure.ac.
> #
> # if [ "${srcdir}" = "." ] ; then
> # if [ "${with_target_subdir}" != "." ] ; then
> @@ -182,8 +182,8 @@ if [ "${enable_multilib}" = yes ]; then
> # ${with_multisubdir} tells us we're in the right branch, but we could be
> # in a subdir of that.
> # ??? The previous version could void this test by separating the process into
> -# two files: one that only the library's toplevel configure.in ran (to
> -# configure the multilib subdirs), and another that all configure.in's ran to
> +# two files: one that only the library's toplevel configure.ac ran (to
> +# configure the multilib subdirs), and another that all configure.ac's ran to
> # update the Makefile. It seemed reasonable to collapse all multilib support
> # into one file, but it does leave us with having to perform this test.
> ml_toplevel_p=no
> Index: configure
> ===================================================================
> --- configure (revision 223630)
> +++ configure (working copy)
> @@ -6152,7 +6152,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages+set}" != xset; then
> if test x"${LANGUAGES+set}" = xset; then
> enable_languages="${LANGUAGES}"
> - echo configure.in: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> + echo configure.ac: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> else
> enable_languages=all
> fi
> @@ -6160,7 +6160,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages}" = x ||
> test x"${enable_languages}" = xyes;
> then
> - echo configure.in: --enable-languages needs at least one
> language argument 1>&2
> + echo configure.ac: --enable-languages needs at least one
> language argument 1>&2
> exit 1
> fi
> fi
> @@ -6170,7 +6170,7 @@ if test -d ${srcdir}/gcc; then
> # and make the substitution.
> case ,${enable_languages}, in
> *,f95,*)
> - echo configure.in: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> + echo configure.ac: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
> ;;
> esac
> @@ -6774,7 +6774,7 @@ fi
> # have requested that this magic not happen.
> #
> # The command line options always override the explicit settings in
> -# configure.in, and the settings in configure.in override this magic.
> +# configure.ac, and the settings in configure.ac override this magic.
> #
> # If the default for a toolchain is to use GNU as and ld, and you don't
> # want to do that, then you should use the --without-gnu-as and
> Index: configure.ac
> ===================================================================
> --- configure.ac (revision 223630)
> +++ configure.ac (working copy)
> @@ -1849,7 +1849,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages+set}" != xset; then
> if test x"${LANGUAGES+set}" = xset; then
> enable_languages="${LANGUAGES}"
> - echo configure.in: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> + echo configure.ac: warning: setting LANGUAGES is deprecated,
> use --enable-languages instead 1>&2
> else
> enable_languages=all
> fi
> @@ -1857,7 +1857,7 @@ if test -d ${srcdir}/gcc; then
> if test x"${enable_languages}" = x ||
> test x"${enable_languages}" = xyes;
> then
> - echo configure.in: --enable-languages needs at least one
> language argument 1>&2
> + echo configure.ac: --enable-languages needs at least one
> language argument 1>&2
> exit 1
> fi
> fi
> @@ -1867,7 +1867,7 @@ if test -d ${srcdir}/gcc; then
> # and make the substitution.
> case ,${enable_languages}, in
> *,f95,*)
> - echo configure.in: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> + echo configure.ac: warning: 'f95' as language name is
> deprecated, use 'fortran' instead 1>&2
> enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
> ;;
> esac
> @@ -2420,7 +2420,7 @@ fi
> # have requested that this magic not happen.
> #
> # The command line options always override the explicit settings in
> -# configure.in, and the settings in configure.in override this magic.
> +# configure.ac, and the settings in configure.ac override this magic.
> #
> # If the default for a toolchain is to use GNU as and ld, and you don't
> # want to do that, then you should use the --without-gnu-as and
> Index: gcc/ChangeLog
> ===================================================================
> --- gcc/ChangeLog (revision 223630)
> +++ gcc/ChangeLog (working copy)
> @@ -1,3 +1,13 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * acinclude.m4: Reflects renaming of configure.in to configure.ac
> + * configure: Reflects renaming of configure.in to configure.ac
> + * configure.ac: Reflects renaming of configure.in to configure.ac
> + * doc/install.texi: Reflects renaming of configure.in to configure.ac
> + * doc/tm.texi: Reflects renaming of configure.in to configure.ac
> + * doc/tm.texi.in: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-22 Jan Hubicka <hubicka@ucw.cz>
>
> * ipa-utils.h (method_class_type): Remove.
> Index: gcc/acinclude.m4
> ===================================================================
> --- gcc/acinclude.m4 (revision 223630)
> +++ gcc/acinclude.m4 (working copy)
> @@ -390,7 +390,7 @@ AC_DEFUN([_gcc_COMPUTE_GAS_VERSION],
> [gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
> for f in $gcc_cv_as_bfd_srcdir/configure \
> $gcc_cv_as_gas_srcdir/configure \
> - $gcc_cv_as_gas_srcdir/configure.in \
> + $gcc_cv_as_gas_srcdir/configure.ac \
> $gcc_cv_as_gas_srcdir/Makefile.in ; do
> gcc_cv_gas_version=`sed -n -e 's/^[[
> ]]*VERSION=[[^0-9A-Za-z_]]*\([[0-9]]*\.[[0-9]]*.*\)/VERSION=\1/p' <
> $f`
> if test x$gcc_cv_gas_version != x; then
> Index: gcc/ada/ChangeLog
> ===================================================================
> --- gcc/ada/ChangeLog (revision 223630)
> +++ gcc/ada/ChangeLog (working copy)
> @@ -1,3 +1,9 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * prj-nmsc.adb: Reflects renaming of configure.in to configure.ac
> + * gcc-interface/Makefile.in: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-22 Ed Schonberg <schonberg@adacore.com>
>
> * sem_ch3.adb (Constrain_Concurrent): If the context is a
> Index: gcc/ada/gcc-interface/Makefile.in
> ===================================================================
> --- gcc/ada/gcc-interface/Makefile.in (revision 223630)
> +++ gcc/ada/gcc-interface/Makefile.in (working copy)
> @@ -148,7 +148,7 @@ GCC_CFLAGS = $(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLA
>
> # We don't use cross-make. Instead we use the tools from the build tree,
> # if they are available.
> -# program_transform_name and objdir are set by configure.in.
> +# program_transform_name and objdir are set by configure.ac.
> program_transform_name =
> objdir = .
>
> Index: gcc/ada/prj-nmsc.adb
> ===================================================================
> --- gcc/ada/prj-nmsc.adb (revision 223630)
> +++ gcc/ada/prj-nmsc.adb (working copy)
> @@ -580,7 +580,7 @@ package body Prj.Nmsc is
> Canonical_Case_File_Name (Suf);
>
> -- The file name must end with the suffix (which is not an extension)
> - -- For instance a suffix "configure.in" must match a file with the
> + -- For instance a suffix "configure.ac" must match a file with the
> -- same name. To avoid dummy cases, though, a suffix starting with
> -- '.' requires a file that is at least one character longer ('.cpp'
> -- should not match a file with the same name).
> Index: gcc/configure
> ===================================================================
> --- gcc/configure (revision 223630)
> +++ gcc/configure (working copy)
> @@ -21539,7 +21539,7 @@ else
>
> if test -x "$DEFAULT_ASSEMBLER"; then
> gcc_cv_as="$DEFAULT_ASSEMBLER"
> -elif test -f $gcc_cv_as_gas_srcdir/configure.in \
> +elif test -f $gcc_cv_as_gas_srcdir/configure.ac \
> && test -f ../gas/Makefile \
> && test x$build = x$host; then
> gcc_cv_as=../gas/as-new$build_exeext
> @@ -21612,7 +21612,7 @@ $as_echo "newly built gas" >&6; }
> gcc_cv_as_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
> for f in $gcc_cv_as_bfd_srcdir/configure \
> $gcc_cv_as_gas_srcdir/configure \
> - $gcc_cv_as_gas_srcdir/configure.in \
> + $gcc_cv_as_gas_srcdir/configure.ac \
> $gcc_cv_as_gas_srcdir/Makefile.in ; do
> gcc_cv_gas_version=`sed -n -e 's/^[
> ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
> if test x$gcc_cv_gas_version != x; then
> @@ -21702,7 +21702,7 @@ elif test $install_gold_as_default = yes \
> && test -f ../gold/Makefile \
> && test x$build = x$host; then
> gcc_cv_ld=../gold/ld-new$build_exeext
> -elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
> +elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \
> && test -f ../ld/Makefile \
> && test x$build = x$host; then
> gcc_cv_ld=../ld/ld-new$build_exeext
> @@ -21818,7 +21818,7 @@ $as_echo "newly built ld" >&6; }
> elif test "$ld_is_gold" = yes; then
> in_tree_ld_is_elf=yes
> fi
> - for f in $gcc_cv_ld_bfd_srcdir/configure
> $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in
> $gcc_cv_ld_gld_srcdir/Makefile.in
> + for f in $gcc_cv_ld_bfd_srcdir/configure
> $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac
> $gcc_cv_ld_gld_srcdir/Makefile.in
> do
> gcc_cv_gld_version=`sed -n -e 's/^[
> ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
> if test x$gcc_cv_gld_version != x; then
> @@ -21851,7 +21851,7 @@ if test "${gcc_cv_nm+set}" = set; then :
>
> else
>
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> gcc_cv_nm=../binutils/nm-new$build_exeext
> @@ -21930,7 +21930,7 @@ if test "${gcc_cv_objdump+set}" = set; then :
>
> else
>
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> # Single tree build which includes binutils.
> @@ -22002,7 +22002,7 @@ if test "${gcc_cv_readelf+set}" = set; then :
>
> else
>
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> # Single tree build which includes binutils.
> Index: gcc/configure.ac
> ===================================================================
> --- gcc/configure.ac (revision 223630)
> +++ gcc/configure.ac (working copy)
> @@ -2092,7 +2092,7 @@ m4_pattern_allow([AS_FOR_TARGET])dnl
> AS_VAR_SET_IF(gcc_cv_as,, [
> if test -x "$DEFAULT_ASSEMBLER"; then
> gcc_cv_as="$DEFAULT_ASSEMBLER"
> -elif test -f $gcc_cv_as_gas_srcdir/configure.in \
> +elif test -f $gcc_cv_as_gas_srcdir/configure.ac \
> && test -f ../gas/Makefile \
> && test x$build = x$host; then
> gcc_cv_as=../gas/as-new$build_exeext
> @@ -2181,7 +2181,7 @@ elif test $install_gold_as_default = yes \
> && test -f ../gold/Makefile \
> && test x$build = x$host; then
> gcc_cv_ld=../gold/ld-new$build_exeext
> -elif test -f $gcc_cv_ld_gld_srcdir/configure.in \
> +elif test -f $gcc_cv_ld_gld_srcdir/configure.ac \
> && test -f ../ld/Makefile \
> && test x$build = x$host; then
> gcc_cv_ld=../ld/ld-new$build_exeext
> @@ -2245,7 +2245,7 @@ if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext \
> elif test "$ld_is_gold" = yes; then
> in_tree_ld_is_elf=yes
> fi
> - for f in $gcc_cv_ld_bfd_srcdir/configure
> $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.in
> $gcc_cv_ld_gld_srcdir/Makefile.in
> + for f in $gcc_cv_ld_bfd_srcdir/configure
> $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ld_gld_srcdir/configure.ac
> $gcc_cv_ld_gld_srcdir/Makefile.in
> do
> changequote(,)dnl
> gcc_cv_gld_version=`sed -n -e 's/^[
> ]*VERSION=[^0-9A-Za-z_]*\([0-9]*\.[0-9]*.*\)/VERSION=\1/p' < $f`
> @@ -2278,7 +2278,7 @@ AC_SUBST(ORIGINAL_LD_GOLD_FOR_TARGET)
> # Figure out what nm we will be using.
> gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils
> AS_VAR_SET_IF(gcc_cv_nm,, [
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> gcc_cv_nm=../binutils/nm-new$build_exeext
> @@ -2310,7 +2310,7 @@ esac
>
> # Figure out what objdump we will be using.
> AS_VAR_SET_IF(gcc_cv_objdump,, [
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> # Single tree build which includes binutils.
> @@ -2335,7 +2335,7 @@ fi
>
> # Figure out what readelf we will be using.
> AS_VAR_SET_IF(gcc_cv_readelf,, [
> -if test -f $gcc_cv_binutils_srcdir/configure.in \
> +if test -f $gcc_cv_binutils_srcdir/configure.ac \
> && test -f ../binutils/Makefile \
> && test x$build = x$host; then
> # Single tree build which includes binutils.
> Index: gcc/doc/install.texi
> ===================================================================
> --- gcc/doc/install.texi (revision 223630)
> +++ gcc/doc/install.texi (working copy)
> @@ -2097,7 +2097,7 @@ machine. In general, if the Java front end is ena
> libraries will be enabled too, unless they're known to not work on
> the target platform. If GCJ is enabled but @samp{libgcj} isn't built, you
> may need to port it; in this case, before modifying the top-level
> -@file{configure.in} so that @samp{libgcj} is enabled by default on
> this platform,
> +@file{configure.ac} so that @samp{libgcj} is enabled by default on
> this platform,
> you may use @option{--enable-libgcj} to override the default.
>
> @end table
> Index: gcc/doc/tm.texi
> ===================================================================
> --- gcc/doc/tm.texi (revision 223630)
> +++ gcc/doc/tm.texi (working copy)
> @@ -412,7 +412,7 @@ If defined, this macro is an additional prefix to
> @code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched
> when the compiler is built as a cross
> compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it
> -to the list of directories used to find the assembler in @file{configure.in}.
> +to the list of directories used to find the assembler in @file{configure.ac}.
> @end defmac
>
> @defmac STANDARD_STARTFILE_PREFIX
> Index: gcc/doc/tm.texi.in
> ===================================================================
> --- gcc/doc/tm.texi.in (revision 223630)
> +++ gcc/doc/tm.texi.in (working copy)
> @@ -410,7 +410,7 @@ If defined, this macro is an additional prefix to
> @code{STANDARD_EXEC_PREFIX}. @code{MD_EXEC_PREFIX} is not searched
> when the compiler is built as a cross
> compiler. If you define @code{MD_EXEC_PREFIX}, then be sure to add it
> -to the list of directories used to find the assembler in @file{configure.in}.
> +to the list of directories used to find the assembler in @file{configure.ac}.
> @end defmac
>
> @defmac STANDARD_STARTFILE_PREFIX
> Index: intl/ChangeLog
> ===================================================================
> --- intl/ChangeLog (revision 223630)
> +++ intl/ChangeLog (working copy)
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
>
> * aclocal.m4: Regenerated with automake-1.11.6.
> Index: intl/configure
> ===================================================================
> --- intl/configure (revision 223630)
> +++ intl/configure (working copy)
> @@ -7851,7 +7851,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6
> if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
> # The LINGUAS file contains the set of available languages.
> if test -n "$OBSOLETE_ALL_LINGUAS"; then
> - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.in is obsolete" || echo "setting ALL_LINGUAS in
> configure.in is obsolete"
> + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS
> in configure.ac is obsolete" || echo "setting ALL_LINGUAS in
> configure.ac is obsolete"
> fi
> ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
> # Hide the ALL_LINGUAS assigment from automake.
> @@ -7858,7 +7858,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6
> eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
> POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
> else
> - # The set of available languages was given in configure.in.
> + # The set of available languages was given in configure.ac.
> eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
> fi
> case "$ac_given_srcdir" in
> Index: libjava/ChangeLog
> ===================================================================
> --- libjava/ChangeLog (revision 223630)
> +++ libjava/ChangeLog (working copy)
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Eric Botcazou <ebotcazou@adacore.com>
>
> * configure.ac: Include config/sjlj.m4.
> Index: libjava/classpath/ChangeLog
> ===================================================================
> --- libjava/classpath/ChangeLog (revision 223630)
> +++ libjava/classpath/ChangeLog (working copy)
> @@ -1,3 +1,12 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * INSTALL: Reflects renaming of configure.in to configure.ac
> + * ltconfig: Reflects renaming of configure.in to configure.ac
> + * m4/ac_prog_javac.m4: Reflects renaming of configure.in to configure.ac
> + * m4/ac_prog_javac_works.m4: Reflects renaming of configure.in to configure.ac
> + * resource/META-INF/mimetypes.default: Reflects renaming of
> configure.in to configure.ac
> +
> 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
>
> * Makefile.in: Regenerated with automake-1.11.6.
> Index: libjava/classpath/INSTALL
> ===================================================================
> --- libjava/classpath/INSTALL (revision 223630)
> +++ libjava/classpath/INSTALL (working copy)
> @@ -43,10 +43,9 @@ be considered for the next release. If you are us
> some point `config.cache' contains results you don't want to keep, you
> may remove or edit it.
>
> - The file `configure.ac' (or `configure.in') is used to create
> -`configure' by a program called `autoconf'. You need `configure.ac' if
> -you want to change it or regenerate `configure' using a newer version
> -of `autoconf'.
> + The file `configure.ac' is used to create `configure' by a program
> +called `autoconf'. You need `configure.ac' if you want to change it or
> +regenerate `configure' using a newer version of `autoconf'.
>
> The simplest way to compile this package is:
>
> Index: libjava/classpath/ltconfig
> ===================================================================
> --- libjava/classpath/ltconfig (revision 223630)
> +++ libjava/classpath/ltconfig (working copy)
> @@ -1588,7 +1588,7 @@ fi
> echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
>
> # Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
> -# configure.in, otherwise build static only libraries.
> +# configure.ac, otherwise build static only libraries.
> case $host_os in
> cygwin* | mingw* | pw32* | os2*)
> if test x$can_build_shared = xyes; then
> Index: libjava/classpath/m4/ac_prog_javac.m4
> ===================================================================
> --- libjava/classpath/m4/ac_prog_javac.m4 (revision 223630)
> +++ libjava/classpath/m4/ac_prog_javac.m4 (working copy)
> @@ -7,7 +7,7 @@ dnl ones.
> dnl
> dnl If you want to force a specific compiler:
> dnl
> -dnl - at the configure.in level, set JAVAC=yourcompiler before calling
> +dnl - at the configure.ac level, set JAVAC=yourcompiler before calling
> dnl AC_PROG_JAVAC
> dnl
> dnl - at the configure level, setenv JAVAC
> @@ -25,7 +25,7 @@ dnl programs. It is VERY IMPORTANT that you downlo
> dnl some macros depend on other. Unfortunately, the autoconf archive
> dnl does not support the concept of set of macros, so I had to break it
> dnl for submission. The general documentation, as well as the sample
> -dnl configure.in, is included in the AC_PROG_JAVA macro.
> +dnl configure.ac, is included in the AC_PROG_JAVA macro.
> dnl
> dnl @category Java
> dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
> Index: libjava/classpath/m4/ac_prog_javac_works.m4
> ===================================================================
> --- libjava/classpath/m4/ac_prog_javac_works.m4 (revision 223630)
> +++ libjava/classpath/m4/ac_prog_javac_works.m4 (working copy)
> @@ -7,7 +7,7 @@ dnl programs. It is VERY IMPORTANT that you downlo
> dnl some macros depend on other. Unfortunately, the autoconf archive
> dnl does not support the concept of set of macros, so I had to break it
> dnl for submission. The general documentation, as well as the sample
> -dnl configure.in, is included in the AC_PROG_JAVA macro.
> +dnl configure.ac, is included in the AC_PROG_JAVA macro.
> dnl
> dnl @category Java
> dnl @author Stephane Bortzmeyer <bortzmeyer@pasteur.fr>
> Index: libjava/classpath/resource/META-INF/mimetypes.default
> ===================================================================
> --- libjava/classpath/resource/META-INF/mimetypes.default (revision 223630)
> +++ libjava/classpath/resource/META-INF/mimetypes.default (working copy)
> @@ -2,7 +2,7 @@
> # A simple, old format, mime.types file
> #
> #
> -# It would be cool to have this auto-generated by configure.in
> +# It would be cool to have this auto-generated by configure.ac
> # depending on some dependancy somehow
> #
> text/html html htm
> Index: libjava/configure
> ===================================================================
> --- libjava/configure (revision 223630)
> +++ libjava/configure (working copy)
> @@ -28309,7 +28309,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
> Index: libobjc/ChangeLog
> ===================================================================
> --- libobjc/ChangeLog (revision 223630)
> +++ libobjc/ChangeLog (working copy)
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * THREADS: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Eric Botcazou <ebotcazou@adacore.com>
>
> * configure.ac: Remove manual SJLJ check.
> Index: libobjc/THREADS
> ===================================================================
> --- libobjc/THREADS (revision 223630)
> +++ libobjc/THREADS (working copy)
> @@ -108,7 +108,7 @@ this thread backend is able to automatically switc
> mode if the threading library is not linked in.
>
> If you want to compile libobjc standalone, then you would need to modify
> -the configure.in and makefiles for it and you need to import the
> +the configure.ac and makefiles for it and you need to import the
> gthread code from GCC.
>
> ******************************************************************************
> Index: liboffloadmic/ChangeLog
> ===================================================================
> --- liboffloadmic/ChangeLog (revision 223630)
> +++ liboffloadmic/ChangeLog (working copy)
> @@ -1,3 +1,8 @@
> +2015-05-24 Michael Darling <darlingm@gmail.com>
> +
> + PR other/66259
> + * configure: Reflects renaming of configure.in to configure.ac
> +
> 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
>
> * Makefile.in: Regenerated with automake-1.11.6.
> Index: liboffloadmic/configure
> ===================================================================
> --- liboffloadmic/configure (revision 223630)
> +++ liboffloadmic/configure (working copy)
> @@ -17076,7 +17076,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
> ac_sub_configure=$ac_srcdir/configure.gnu
> elif test -f "$ac_srcdir/configure"; then
> ac_sub_configure=$ac_srcdir/configure
> - elif test -f "$ac_srcdir/configure.in"; then
> + elif test -f "$ac_srcdir/configure.ac"; then
> # This should be Cygnus configure.
> ac_sub_configure=$ac_aux_dir/configure
> else
-------------- next part --------------
A non-text attachment was scrubbed...
Name: gcc.combined.build.patch.updated
Type: application/octet-stream
Size: 35472 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20150717/44f2a2ea/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: binutils-gdb.combined.build.patch.updated
Type: application/octet-stream
Size: 81125 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20150717/44f2a2ea/attachment-0001.obj>
More information about the Gcc-patches
mailing list