From f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Wed, 29 Oct 2014 14:46:15 -0700
Subject: [PATCH] Continue to use march=i686 before fix of g++ ICE.

BUG: 18174291
BUG: 18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
---
 core/combo/arch/x86/x86.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/combo/arch/x86/x86.mk b/core/combo/arch/x86/x86.mk
index f0704263b7..c98d57896d 100644
--- a/core/combo/arch/x86/x86.mk
+++ b/core/combo/arch/x86/x86.mk
@@ -13,7 +13,11 @@ ARCH_X86_HAVE_MOVBE := false
 ARCH_X86_HAVE_POPCNT := false
 
 
-# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs.
+# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs,
+# when compiled with clang/llvm.
+# But g++ could have internal error with march=prescott. So we will use
+# march=i686 until the g++ error is fixed or all Android modules can work around
+# that problem, see b/18174291.
 arch_variant_cflags := \
-    -march=prescott \
+    -march=i686 \