aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-04-14 20:36:27 -0700
committerAndrew Hsieh <andrewhsieh@google.com>2014-04-22 16:15:42 -0700
commitb905a68c1466ba74fac49abc4fb35930c5c456cf (patch)
tree5f16b7679584e195299ed00c8d8439d1715d934d /gcc-4.9
parent42bf51abe03e8701b12b3c0ecba898d0f7fe625d (diff)
downloadtoolchain_gcc-b905a68c1466ba74fac49abc4fb35930c5c456cf.tar.gz
toolchain_gcc-b905a68c1466ba74fac49abc4fb35930c5c456cf.tar.bz2
toolchain_gcc-b905a68c1466ba74fac49abc4fb35930c5c456cf.zip
[4.9] Use READELF_FOR_TARGET in GCC 4.9
See 59f82b394a9ece7ea20714014a0b9800da3a87fe Change-Id: I209ab527ff7ff75d11c24c8b41fc597f7062e1a3
Diffstat (limited to 'gcc-4.9')
-rwxr-xr-xgcc-4.9/gcc/configure6
-rw-r--r--gcc-4.9/gcc/configure.ac4
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc-4.9/gcc/configure b/gcc-4.9/gcc/configure
index 415377adc..2c5df6d84 100755
--- a/gcc-4.9/gcc/configure
+++ b/gcc-4.9/gcc/configure
@@ -21775,9 +21775,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.9/gcc/configure.ac b/gcc-4.9/gcc/configure.ac
index 0336066cc..49dfb62f1 100644
--- a/gcc-4.9/gcc/configure.ac
+++ b/gcc-4.9/gcc/configure.ac
@@ -2234,8 +2234,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)