diff options
| author | Caroline Tice <cmtice@google.com> | 2016-02-29 22:49:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-02-29 22:49:18 +0000 |
| commit | 3a800d7d75ceba88429096186a2150a2d938334a (patch) | |
| tree | 9d9c36a627f01c31b077cd8253acc681d5cc4bbf /gcc-4.9/gcc/config.gcc | |
| parent | b9de1157289455b0ca26daff519d4a0ddcd1fa13 (diff) | |
| parent | 817a788f9eb01eff367191401d48f2aaa8d4f428 (diff) | |
| download | toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.gz toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.tar.bz2 toolchain_gcc-3a800d7d75ceba88429096186a2150a2d938334a.zip | |
Merge "Unify ChromeOS and Android versions of GCC."
Diffstat (limited to 'gcc-4.9/gcc/config.gcc')
| -rw-r--r-- | gcc-4.9/gcc/config.gcc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gcc-4.9/gcc/config.gcc b/gcc-4.9/gcc/config.gcc index 925658a82..c0fdd2c11 100644 --- a/gcc-4.9/gcc/config.gcc +++ b/gcc-4.9/gcc/config.gcc @@ -1091,7 +1091,9 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm*-*-rtems*) tmake_file="${tmake_file} arm/t-symbian" ;; esac - tm_file="${tm_file} arm/aout.h vxworks-dummy.h arm/arm.h" + tm_defines="${tm_defines} ANDROID_DEFAULT=0" + tm_file="${tm_file} arm/aout.h vxworks-dummy.h arm/arm.h linux-android.h" + extra_options="${extra_options} linux-android.opt" ;; avr-*-rtems*) tm_file="elfos.h avr/elf.h avr/avr-arch.h avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h" @@ -2342,7 +2344,7 @@ powerpc-*-rtems*) powerpc*-*-linux*) tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h rs6000/sysv4.h linux-android.h" extra_options="${extra_options} rs6000/sysv4.opt" - extra_options="${extra_options} linux-android.opt" + extra_options="${extra_options} linux-android.opt" tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm" extra_objs="$extra_objs rs6000-linux.o" default_gnu_indirect_function=yes |