commit c1a5664ea3882800dfc538a9591828f9c429f6d7
author Pavel Chupin <pavel.v.chupin@intel.com> Fri Aug 23 16:49:21 2013 +0400
committer Pavel Chupin <pavel.v.chupin@intel.com> Mon Aug 26 10:42:42 2013 +0400
tree 8842f2193bb1b3ec9369ac856b495f50d8cca9d0
parent 929b3a24b0c1b1ff2488ef08f05040c63aeaa9ed

Switch x86 default compiler to multilib version

Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler.
Tested x86 image build on Linux and Darwin.

This bionic patch is required:
https://android-review.googlesource.com/#/c/64183

Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>

core/llvm_config.mk

diff --git a/core/llvm_config.mk b/core/llvm_config.mk
index 0fe9f93..c679e42 100644
--- a/core/llvm_config.mk
+++ b/core/llvm_config.mk
@@ -72,11 +72,11 @@
   CLANG_CONFIG_EXTRA_ASFLAGS += \
     -target i686-linux-android \
     -nostdlibinc \
-    -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
+    -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
   CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS)
   CLANG_CONFIG_EXTRA_LDFLAGS += \
     -target i686-linux-android \
-    -B$(TARGET_TOOLCHAIN_ROOT)/i686-linux-android/bin
+    -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin
   CLANG_CONFIG_UNKNOWN_CFLAGS += \
     -finline-limit=300 \
     -fno-inline-functions-called-once \