diff options
author | Caroline Tice <cmtice@google.com> | 2016-02-10 14:40:41 -0800 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2016-02-26 08:25:55 -0800 |
commit | 817a788f9eb01eff367191401d48f2aaa8d4f428 (patch) | |
tree | 637f745404b37fbf3fcff629227d7d542725e5fe /gcc-4.9/gcc/config.gcc | |
parent | a4ca82cac69c3147143d7b4b4d7cdeb5e02f20ef (diff) | |
download | toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.zip toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.gz toolchain_gcc-817a788f9eb01eff367191401d48f2aaa8d4f428.tar.bz2 |
Unify ChromeOS and Android versions of GCC.
This CL updates Android's GCC to match ChromeOS's GCC (with
appropriate patches applied in both places to make sure no
cherry-picked changes are lost).
Change-Id: I390140c449b0e5df9ee78a06268319c8c510302f
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 925658a..c0fdd2c 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 |