From 51e55c1d22576de38ca4b65deaded7b3a1af8387 Mon Sep 17 00:00:00 2001 From: Chih-hung Hsieh Date: Thu, 30 Oct 2014 01:55:45 +0000 Subject: [PATCH] Revert "Continue to use march=i686 before fix of g++ ICE." This reverts commit f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b. Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6 --- core/combo/arch/x86/x86.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/combo/arch/x86/x86.mk b/core/combo/arch/x86/x86.mk index c98d57896..f0704263b 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 \ -- 2.11.0