aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2014-07-08 03:24:10 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-07-02 21:34:49 +0000
commit1a6666161c7e53383194203abfbe0367a804416f (patch)
tree729e0d09f383438a6732e77428598457951478a4
parent0b2e01a4c543da93214656a32bb6b6dce5efa2de (diff)
parentbaf87df3cb2683649ba7e9872362a7e721117c23 (diff)
downloadtoolchain_gcc-1a6666161c7e53383194203abfbe0367a804416f.tar.gz
toolchain_gcc-1a6666161c7e53383194203abfbe0367a804416f.tar.bz2
toolchain_gcc-1a6666161c7e53383194203abfbe0367a804416f.zip
Merge "Fix mips64el-linux-android-4.9 build"
-rw-r--r--gcc-4.9/gcc/config.gcc3
1 files changed, 2 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/config.gcc b/gcc-4.9/gcc/config.gcc
index 41c9d81dc..3d687d2e8 100644
--- a/gcc-4.9/gcc/config.gcc
+++ b/gcc-4.9/gcc/config.gcc
@@ -1969,14 +1969,15 @@ mips*-mti-linux*)
mips64*-*-linux* | mipsisa64*-*-linux*)
tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h ${tm_file} mips/gnu-user.h mips/gnu-user64.h mips/linux64.h mips/linux-common.h"
extra_options="${extra_options} linux-android.opt"
+ tmake_file="${tmake_file} mips/t-linux64"
case ${target} in
*android*)
# Default to ABI_64 for MIPS64 Android
tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64"
+ tm_defines="${tm_defines} MIPS_ISA_DEFAULT=69"
;;
*)
tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
- tmake_file="${tmake_file} mips/t-linux64"
;;
esac
case ${target} in