commit bbaeaa5879c5ab380c024bd20f35e927f4d19c87
author Ying Wang <wangying@android.com> Wed Jul 01 18:58:51 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 01 18:58:52 2015 +0000
tree 93433b022b58eff65f8f45cadf1d3a1067092a37
parent 473dfdf71b984fb04ae8f60b8941d89ef5c76710
parent ab3a5f490cd4d0bd035caa5cf87e4837567c781e

Merge "Configure synci generation explicitly"

core/clang/mips.mk

diff --git a/core/clang/mips.mk b/core/clang/mips.mk
index 70832a3..4a8f812 100644
--- a/core/clang/mips.mk
+++ b/core/clang/mips.mk
@@ -12,6 +12,7 @@
   -frerun-cse-after-loop \
   -frename-registers \
   -msynci \
+  -mno-synci \
   -mno-fused-madd
 
 # Temporary workaround for Mips clang++ problem,  creates

core/clang/mips64.mk

diff --git a/core/clang/mips64.mk b/core/clang/mips64.mk
index ba9c1d1..1b72e05 100644
--- a/core/clang/mips64.mk
+++ b/core/clang/mips64.mk
@@ -12,6 +12,7 @@
   -frerun-cse-after-loop \
   -frename-registers \
   -msynci \
+  -mno-synci \
   -mno-fused-madd
 
 # Temporary workaround for Mips clang++ problem creating

core/combo/arch/mips/mips32-fp.mk

diff --git a/core/combo/arch/mips/mips32-fp.mk b/core/combo/arch/mips/mips32-fp.mk
index 8320e93..912ff63 100644
--- a/core/combo/arch/mips/mips32-fp.mk
+++ b/core/combo/arch/mips/mips32-fp.mk
@@ -7,6 +7,7 @@
     -mips32 \
     -mfp32 \
     -modd-spreg \
+    -mno-synci
 
 arch_variant_ldflags := \
     -Wl,-melf32ltsmip

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
index 2b4f714..09b3bc2 100644
--- a/core/combo/arch/mips/mips32r2-fp-xburst.mk
+++ b/core/combo/arch/mips/mips32r2-fp-xburst.mk
@@ -9,7 +9,8 @@
     -mfp32 \
     -modd-spreg \
     -mno-fused-madd \
-    -Wa,-mmxu
+    -Wa,-mmxu \
+    -mno-synci
 
 arch_variant_ldflags := \
     -Wl,-melf32ltsmip