diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-30 23:30:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-30 23:30:05 +0000 |
| commit | 81379e6590689b0852da40f6477d8d32525d934b (patch) | |
| tree | 2e1412b11863edbeb8f298f6acea412ab61273ba /core/clang | |
| parent | b4cd156bb2946bb074be6afcfb6c905ed35334ef (diff) | |
| parent | e4d54f317df641faf216e4000fbc3d091d3c1abc (diff) | |
| download | build-81379e6590689b0852da40f6477d8d32525d934b.zip build-81379e6590689b0852da40f6477d8d32525d934b.tar.gz build-81379e6590689b0852da40f6477d8d32525d934b.tar.bz2 | |
am e4d54f31: am 0b3c42cb: Merge "[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains"
* commit 'e4d54f317df641faf216e4000fbc3d091d3c1abc':
[MIPS] Unite mipsel and mips64el 4.9 gcc toolchains
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/TARGET_mips.mk | 2 | ||||
| -rw-r--r-- | core/clang/mips.mk | 11 | ||||
| -rw-r--r-- | core/clang/mips64.mk | 8 |
3 files changed, 6 insertions, 15 deletions
diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index de615b0..0107519 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -3,7 +3,7 @@ include $(BUILD_SYSTEM)/clang/mips.mk CLANG_CONFIG_mips_TARGET_TRIPLE := mipsel-linux-android CLANG_CONFIG_mips_TARGET_TOOLCHAIN_PREFIX := \ - $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/$(CLANG_CONFIG_mips_TARGET_TRIPLE)/bin + $($(clang_2nd_arch_prefix)TARGET_TOOLCHAIN_ROOT)/mips64el-linux-android/bin CLANG_CONFIG_mips_TARGET_EXTRA_ASFLAGS := \ $(CLANG_CONFIG_EXTRA_ASFLAGS) \ diff --git a/core/clang/mips.mk b/core/clang/mips.mk index cef7823..88721e9 100644 --- a/core/clang/mips.mk +++ b/core/clang/mips.mk @@ -7,18 +7,17 @@ CLANG_CONFIG_mips_EXTRA_LDFLAGS := # Include common unknown flags CLANG_CONFIG_mips_UNKNOWN_CFLAGS := \ $(CLANG_CONFIG_UNKNOWN_CFLAGS) \ - -EL \ -mips32 \ -mips32r2 \ - -mhard-float \ + -mfp32 \ + -mfp64 \ + -mfpxx \ + -modd-spreg \ + -mno-odd-spreg \ -fno-strict-volatile-bitfields \ -fgcse-after-reload \ -frerun-cse-after-loop \ -frename-registers \ - -march=mips32r2 \ - -mtune=mips32r2 \ - -march=mips32 \ - -mtune=mips32 \ -msynci \ -mno-fused-madd diff --git a/core/clang/mips64.mk b/core/clang/mips64.mk index 9d1117b..d087b9b 100644 --- a/core/clang/mips64.mk +++ b/core/clang/mips64.mk @@ -9,18 +9,10 @@ CLANG_CONFIG_mips64_EXTRA_LDFLAGS := # Include common unknown flags CLANG_CONFIG_mips64_UNKNOWN_CFLAGS := \ $(CLANG_CONFIG_UNKNOWN_CFLAGS) \ - -EL \ - -mips32 \ - -mips32r2 \ - -mhard-float \ -fno-strict-volatile-bitfields \ -fgcse-after-reload \ -frerun-cse-after-loop \ -frename-registers \ - -march=mips32r2 \ - -mtune=mips32r2 \ - -march=mips32 \ - -mtune=mips32 \ -msynci \ -mno-fused-madd |