summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@android.com>2013-05-21 12:25:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-21 12:25:39 -0700
commit210aee35a9dec3b94ab0cfc247e6c89c1e387f19 (patch)
tree4fa8ef2e2a5d3a2cebcda05b78748698fc23d4ea
parentfd5b59feba63a695977169e4f3fee3133af97c1e (diff)
parentfa29872ae08408f90e1282bff36a0bdba13d0fdc (diff)
downloadbuild-210aee35a9dec3b94ab0cfc247e6c89c1e387f19.zip
build-210aee35a9dec3b94ab0cfc247e6c89c1e387f19.tar.gz
build-210aee35a9dec3b94ab0cfc247e6c89c1e387f19.tar.bz2
am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc': [MIPS] Disabled madd support for Ingenic Xburst CPUs.
-rw-r--r--core/combo/arch/mips/mips32r2-fp-xburst.mk17
-rw-r--r--core/llvm_config.mk3
2 files changed, 19 insertions, 1 deletions
diff --git a/core/combo/arch/mips/mips32r2-fp-xburst.mk b/core/combo/arch/mips/mips32r2-fp-xburst.mk
new file mode 100644
index 0000000..3768226
--- /dev/null
+++ b/core/combo/arch/mips/mips32r2-fp-xburst.mk
@@ -0,0 +1,17 @@
+# Configuration for Android on Ingenic xb4780/Xburst MIPS CPU.
+# Generating binaries for MIPS32R2/hard-float/little-endian without
+# support for the Madd family of instructions.
+
+ARCH_MIPS_HAS_FPU :=true
+ARCH_HAVE_ALIGNED_DOUBLES :=true
+arch_variant_cflags := \
+ -EL \
+ -march=mips32r2 \
+ -mtune=mips32r2 \
+ -mips32r2 \
+ -mhard-float \
+ -msynci \
+ -mno-fused-madd
+
+arch_variant_ldflags := \
+ -EL
diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index c4b4af4..18e689e 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -64,7 +64,8 @@ ifeq ($(TARGET_ARCH),mips)
-mtune=mips32r2 \
-march=mips32 \
-mtune=mips32 \
- -msynci
+ -msynci \
+ -mno-fused-madd
endif
ifeq ($(TARGET_ARCH),x86)
RS_TRIPLE := i686-unknown-linux