[Tcwg-commits] [gcc] 09/09: Also check configure.ac in binutils source tree

17 Jul 2015

This is an automated email from the git hooks/post-receive script.
unknown user pushed a commit to branch hjl/iamcu/improve
in repository gcc.
commit 3fae803ef6f8bf89b453fe693d0137fa7c5fb012
Author: H.J. Lu hjl.tools@gmail.com
Date:   Wed Jul 15 08:07:04 2015 -0700
Also check configure.ac in binutils source tree
The configure.in files in binutils source tree have been renamed to
    configure.ac.  This patch checks both configure.in and configure.ac in
    binutils source tree.
* acinclude.m4 (_gcc_COMPUTE_GAS_VERSION): Also check
    	$gcc_cv_as_gas_srcdir/configure.ac.
    	* configure.ac (gcc_cv_as_gas_configure): New.  Set if
    	configure.in or configure.ac exist.
    	(gcc_cv_ld_gld_configure): Likewise.
    	(gcc_cv_binutils_configure): Likewise.
    	(gcc_cv_as): Check $gcc_cv_as_gas_configure instead of
    	$gcc_cv_as_gas_srcdir/configure.in.
    	(gcc_cv_ld): Check $gcc_cv_ld_gld_configure instead of
    	$gcc_cv_ld_gld_srcdir/configure.in.
    	(gcc_cv_nm): Check $gcc_cv_binutils_configure instead of
    	$gcc_cv_binutils_srcdir/configure.in.
    	(gcc_cv_objdump): Likewise.
    	(gcc_cv_readelf): Likewise.
    	* configure: Regenerated.
_gcc_COMPUTE_GAS_VERSION
---
 gcc/acinclude.m4 |  1 +
 gcc/configure    | 31 +++++++++++++++++++++++++------
 gcc/configure.ac | 30 ++++++++++++++++++++++++------
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4
index 94da88e..3d30b0f 100644
--- a/gcc/acinclude.m4
+++ b/gcc/acinclude.m4
@@ -390,6 +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.ac \
          $gcc_cv_as_gas_srcdir/configure.in \
          $gcc_cv_as_gas_srcdir/Makefile.in ; do
   gcc_cv_gas_version=`sed -n -e 's/^[[ 	]]*VERSION=[[^0-9A-Za-z_]]*([[0-9]]*.[[0 [...]
diff --git a/gcc/configure b/gcc/configure
index 9fb885d..a947d58 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21674,6 +21674,12 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 gcc_cv_gas_major_version=
 gcc_cv_gas_minor_version=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
+gcc_cv_as_gas_configure=
+if test -f $gcc_cv_as_gas_srcdir/configure.in; then
+	gcc_cv_as_gas_configure=$gcc_cv_as_gas_srcdir/configure.in;
+elif test -f $gcc_cv_as_gas_srcdir/configure.ac; then
+	gcc_cv_as_gas_configure=$gcc_cv_as_gas_srcdir/configure.ac
+fi
if test "${gcc_cv_as+set}" = set; then :
@@ -21681,7 +21687,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 -n "$gcc_cv_as_gas_configure" \
      && test -f ../gas/Makefile \
      && test x$build = x$host; then
    gcc_cv_as=../gas/as-new$build_exeext
@@ -21754,6 +21760,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.ac \
          $gcc_cv_as_gas_srcdir/configure.in \
          $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]*.*\ [...]
@@ -21832,6 +21839,12 @@ gcc_cv_gld_minor_version=
 gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
 gcc_cv_ld_gold_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gold
 gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
+gcc_cv_ld_gld_configure=
+if test -f $gcc_cv_ld_gld_srcdir/configure.in; then
+	gcc_cv_ld_gld_configure=gcc_cv_ld_gld_srcdir/configure.in
+elif test -f $gcc_cv_ld_gld_srcdir/configure.ac; then
+	gcc_cv_ld_gld_configure=gcc_cv_ld_gld_srcdir/configure.ac
+fi
if test "${gcc_cv_ld+set}" = set; then :
@@ -21844,7 +21857,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 -n "$gcc_cv_ld_gld_configure" \
      && test -f ../ld/Makefile \
      && test x$build = x$host; then
    gcc_cv_ld=../ld/ld-new$build_exeext
@@ -21960,7 +21973,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
@@ -21989,11 +22002,17 @@ fi
# Figure out what nm we will be using.
 gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils
+gcc_cv_binutils_configure=
+if test -f $gcc_cv_binutils_srcdir/configure.in; then
+	gcc_cv_binutils_configure=$gcc_cv_binutils_srcdir/configure.in
+elif test -f $gcc_cv_binutils_srcdir/configure.ac; then
+	gcc_cv_binutils_configure=$gcc_cv_binutils_srcdir/configure.ac
+fi
 if test "${gcc_cv_nm+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -n "$gcc_cv_binutils_configure" \
      && test -f ../binutils/Makefile \
      && test x$build = x$host; then
    gcc_cv_nm=../binutils/nm-new$build_exeext
@@ -22072,7 +22091,7 @@ if test "${gcc_cv_objdump+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -n "$gcc_cv_binutils_configure" \
      && test -f ../binutils/Makefile \
      && test x$build = x$host; then
    # Single tree build which includes binutils.
@@ -22144,7 +22163,7 @@ if test "${gcc_cv_readelf+set}" = set; then :
else
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -n "$gcc_cv_binutils_configure" \
      && 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 bc574db..40a4a47 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2086,12 +2086,18 @@ AC_SUBST(enable_fast_install)
 gcc_cv_gas_major_version=
 gcc_cv_gas_minor_version=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gas
+gcc_cv_as_gas_configure=
+if test -f $gcc_cv_as_gas_srcdir/configure.in; then
+	gcc_cv_as_gas_configure=$gcc_cv_as_gas_srcdir/configure.in;
+elif test -f $gcc_cv_as_gas_srcdir/configure.ac; then
+	gcc_cv_as_gas_configure=$gcc_cv_as_gas_srcdir/configure.ac
+fi
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 -n "$gcc_cv_as_gas_configure" \
      && test -f ../gas/Makefile \
      && test x$build = x$host; then
    gcc_cv_as=../gas/as-new$build_exeext
@@ -2171,6 +2177,12 @@ gcc_cv_gld_minor_version=
 gcc_cv_ld_gld_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/ld
 gcc_cv_ld_gold_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gold
 gcc_cv_ld_bfd_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/bfd
+gcc_cv_ld_gld_configure=
+if test -f $gcc_cv_ld_gld_srcdir/configure.in; then
+	gcc_cv_ld_gld_configure=gcc_cv_ld_gld_srcdir/configure.in
+elif test -f $gcc_cv_ld_gld_srcdir/configure.ac; then
+	gcc_cv_ld_gld_configure=gcc_cv_ld_gld_srcdir/configure.ac
+fi
AS_VAR_SET_IF(gcc_cv_ld,, [
 if test -x "$DEFAULT_LINKER"; then
@@ -2180,7 +2192,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 -n "$gcc_cv_ld_gld_configure" \
      && test -f ../ld/Makefile \
      && test x$build = x$host; then
    gcc_cv_ld=../ld/ld-new$build_exeext
@@ -2244,7 +2256,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]*.*\ [...]
@@ -2276,8 +2288,14 @@ 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
+gcc_cv_binutils_configure=
+if test -f $gcc_cv_binutils_srcdir/configure.in; then
+	gcc_cv_binutils_configure=$gcc_cv_binutils_srcdir/configure.in
+elif test -f $gcc_cv_binutils_srcdir/configure.ac; then
+	gcc_cv_binutils_configure=$gcc_cv_binutils_srcdir/configure.ac
+fi
 AS_VAR_SET_IF(gcc_cv_nm,, [
-if test -f $gcc_cv_binutils_srcdir/configure.in \
+if test -n "$gcc_cv_binutils_configure" \
      && test -f ../binutils/Makefile \
      && test x$build = x$host; then
    gcc_cv_nm=../binutils/nm-new$build_exeext
@@ -2309,7 +2327,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 -n "$gcc_cv_binutils_configure" \
      && test -f ../binutils/Makefile \
      && test x$build = x$host; then
    # Single tree build which includes binutils.
@@ -2334,7 +2352,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 -n "$gcc_cv_binutils_configure" \
      && test -f ../binutils/Makefile \
      && test x$build = x$host; then
    # Single tree build which includes binutils.
-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

[Tcwg-commits] [gcc] 09/09: Also check configure.ac in binutils source tree