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

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

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

@@ -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