commit 331b026e1016f0b5e392ba96e11c05f2c78354b8
author Yi Kong <yikong@google.com> Thu Feb 08 14:08:44 2018 +0800
committer android-build-team Robot <android-build-team-robot@google.com> Fri Feb 09 23:43:04 2018 +0000
tree db4562f87cdbb4a4031e71d4c9d7cc8036d32e0f
parent 64695f069f44f0efb85295dd62d8852bea1f327e

Compiler-rt libraries now use i386 instead of i686

Since Clang-4579689, crt libraries use i386 instead of i686. Update the
hardcoded paths to the new names.

Bug: 72942266
Test: N/A
Change-Id: I24f8f5742ac2fecd374fdaa3be8a11f410d31cbf
(cherry picked from commit cbcf11cba06740cdd38c2719d3fd47930af2b076)

core/clang/HOST_CROSS_x86.mk

diff --git a/core/clang/HOST_CROSS_x86.mk b/core/clang/HOST_CROSS_x86.mk
index bf48f95..ffd7811 100644
--- a/core/clang/HOST_CROSS_x86.mk
+++ b/core/clang/HOST_CROSS_x86.mk
@@ -1 +1 @@
-$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
+$(clang_2nd_arch_prefix)HOST_CROSS_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i386.a

core/clang/HOST_x86.mk

diff --git a/core/clang/HOST_x86.mk b/core/clang/HOST_x86.mk
index 0722b2a..2803517 100644
--- a/core/clang/HOST_x86.mk
+++ b/core/clang/HOST_x86.mk
@@ -1 +1 @@
-$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a
+$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i386.a