summaryrefslogtreecommitdiffstats
path: root/core/combo/arch
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2014-10-30 01:55:45 +0000
committerChih-hung Hsieh <chh@google.com>2014-10-30 01:55:45 +0000
commit51e55c1d22576de38ca4b65deaded7b3a1af8387 (patch)
tree31368d39f2ee9e0ba9769374cdbca73d8f20e7a7 /core/combo/arch
parentf70f009ca8b4779cc3a5f44e7d92b1c297e16c8b (diff)
downloadbuild-51e55c1d22576de38ca4b65deaded7b3a1af8387.zip
build-51e55c1d22576de38ca4b65deaded7b3a1af8387.tar.gz
build-51e55c1d22576de38ca4b65deaded7b3a1af8387.tar.bz2
Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b. Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
Diffstat (limited to 'core/combo/arch')
-rw-r--r--core/combo/arch/x86/x86.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/core/combo/arch/x86/x86.mk b/core/combo/arch/x86/x86.mk
index c98d578..f070426 100644
--- a/core/combo/arch/x86/x86.mk
+++ b/core/combo/arch/x86/x86.mk
@@ -13,11 +13,7 @@ ARCH_X86_HAVE_MOVBE := false
ARCH_X86_HAVE_POPCNT := false
-# 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.
+# Some intrinsic functions used by libcxx only exist for prescott or newer CPUs.
arch_variant_cflags := \
- -march=i686 \
+ -march=prescott \