aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.6
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-03-27 18:29:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-03-27 18:29:16 +0000
commitd87cae247d39ebf4f5a6bf25c932a14d2fdb9384 (patch)
treecf6f7707a05f75ad47ce1c7ad3bcf62e4bc8771e /gcc-4.6
parent651152db0b741de25918b21c42d604b8b6564eaa (diff)
parentb159d4300781ae367096e05076df56b1467d0d9b (diff)
downloadtoolchain_gcc-d87cae247d39ebf4f5a6bf25c932a14d2fdb9384.zip
toolchain_gcc-d87cae247d39ebf4f5a6bf25c932a14d2fdb9384.tar.gz
toolchain_gcc-d87cae247d39ebf4f5a6bf25c932a14d2fdb9384.tar.bz2
Merge "Use READELF_FOR_TARGET in GCC 4.6/4.7"
Diffstat (limited to 'gcc-4.6')
-rwxr-xr-xgcc-4.6/gcc/configure6
-rw-r--r--gcc-4.6/gcc/configure.ac4
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc-4.6/gcc/configure b/gcc-4.6/gcc/configure
index 240905c..9e040d9 100755
--- a/gcc-4.6/gcc/configure
+++ b/gcc-4.6/gcc/configure
@@ -21335,9 +21335,11 @@ if test -f $gcc_cv_binutils_srcdir/configure.in \
gcc_cv_readelf=../binutils/readelf$build_exeext
elif test -x readelf$build_exeext; then
gcc_cv_readelf=./readelf$build_exeext
+elif ( set dummy $READELF_FOR_TARGET; test -x $2 ); then
+ gcc_cv_readelf="$READELF_FOR_TARGET"
else
- # Extract the first word of "readelf", so it can be a program name with args.
-set dummy readelf; ac_word=$2
+ # Extract the first word of "$READELF_FOR_TARGET", so it can be a program name with args.
+set dummy $READELF_FOR_TARGET; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_gcc_cv_readelf+set}" = set; then :
diff --git a/gcc-4.6/gcc/configure.ac b/gcc-4.6/gcc/configure.ac
index 3bd2947..87314e7 100644
--- a/gcc-4.6/gcc/configure.ac
+++ b/gcc-4.6/gcc/configure.ac
@@ -2106,8 +2106,10 @@ if test -f $gcc_cv_binutils_srcdir/configure.in \
gcc_cv_readelf=../binutils/readelf$build_exeext
elif test -x readelf$build_exeext; then
gcc_cv_readelf=./readelf$build_exeext
+elif ( set dummy $READELF_FOR_TARGET; test -x $[2] ); then
+ gcc_cv_readelf="$READELF_FOR_TARGET"
else
- AC_PATH_PROG(gcc_cv_readelf, readelf)
+ AC_PATH_PROG(gcc_cv_readelf, $READELF_FOR_TARGET)
fi])
AC_MSG_CHECKING(what readelf to use)