commit a25b9b83bf925b6c703e274833b42bf1db2d443a
author Ying Wang <wangying@android.com> Tue May 21 12:31:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 21 12:31:57 2013 -0700
tree 46661b5229a1933625ab85150aa2c09affaa5d8b
parent c0e3c96d83f6a0fb3b1804f690bf3ab9a41fe0f6
parent 210aee35a9dec3b94ab0cfc247e6c89c1e387f19

am 210aee35: am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs."

* commit '210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
  [MIPS] Disabled madd support for Ingenic Xburst CPUs.

core/combo/arch/mips/mips32r2-fp-xburst.mk

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

core/llvm_config.mk

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 @@
     -mtune=mips32r2 \
     -march=mips32 \
     -mtune=mips32 \
-    -msynci
+    -msynci \
+    -mno-fused-madd
 endif
 ifeq ($(TARGET_ARCH),x86)
   RS_TRIPLE := i686-unknown-linux