This is an automated email from the git hooks/post-receive script.
unknown user pushed a commit to branch hjl/indbr/master in repository gcc.
commit b6a23b4c8fc77c5a8ca8897b347ba9d7d74c73cf Author: Jan Beulich jbeulich@suse.com Date: Thu Jul 23 07:41:06 2015 -0700
fix in-tree-binutils builds
Quite a while ago configure.in go renamed to configure.ac in all of binutils' subtrees - allow for both when checking for that case while configuring.
* acinclude.m4: Replace configure.in by configure.[ai][cn]. * configure.ac: Likewise. * configure: Re-generate. --- gcc/acinclude.m4 | 2 +- gcc/configure | 14 +++++++------- gcc/configure.ac | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index 94da88e..0696ff9 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -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.[ai][cn] \ $gcc_cv_as_gas_srcdir/Makefile.in ; do gcc_cv_gas_version=`sed -n -e 's/^[[ ]]*VERSION=[[^0-9A-Za-z_]]*([[0-9]]*.[[0 [...] if test x$gcc_cv_gas_version != x; then diff --git a/gcc/configure b/gcc/configure index 08bce32..525439d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -21681,7 +21681,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.[ai][cn] \ && test -f ../gas/Makefile \ && test x$build = x$host; then gcc_cv_as=../gas/as-new$build_exeext @@ -21754,7 +21754,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.[ai][cn] \ $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]*.*\ [...] if test x$gcc_cv_gas_version != x; then @@ -21844,7 +21844,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.[ai][cn] \ && test -f ../ld/Makefile \ && test x$build = x$host; then gcc_cv_ld=../ld/ld-new$build_exeext @@ -21960,7 +21960,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_ [...] + for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ [...] do gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*([0-9]*.[0-9]*.*\ [...] if test x$gcc_cv_gld_version != x; then @@ -21993,7 +21993,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext @@ -22072,7 +22072,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. @@ -22144,7 +22144,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. diff --git a/gcc/configure.ac b/gcc/configure.ac index 326bb59..1b6e616 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2091,7 +2091,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.[ai][cn] \ && test -f ../gas/Makefile \ && test x$build = x$host; then gcc_cv_as=../gas/as-new$build_exeext @@ -2180,7 +2180,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.[ai][cn] \ && test -f ../ld/Makefile \ && test x$build = x$host; then gcc_cv_ld=../ld/ld-new$build_exeext @@ -2244,7 +2244,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_ [...] + for f in $gcc_cv_ld_bfd_srcdir/configure $gcc_cv_ld_gld_srcdir/configure $gcc_cv_ [...] do changequote(,)dnl gcc_cv_gld_version=`sed -n -e 's/^[ ]*VERSION=[^0-9A-Za-z_]*([0-9]*.[0-9]*.*\ [...] @@ -2277,7 +2277,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then gcc_cv_nm=../binutils/nm-new$build_exeext @@ -2309,7 +2309,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils. @@ -2334,7 +2334,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.[ai][cn] \ && test -f ../binutils/Makefile \ && test x$build = x$host; then # Single tree build which includes binutils.