commit 3b1315dbaa77151b1f7a8e3fadc0ca95270e070e
author Yi Kong <yikong@google.com> Thu Feb 08 08:39:34 2018 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 08 08:39:34 2018 +0000
tree cf41db1f3575b3a8b364fd08f82dd815b7b928e7
parent e5f2a716cb4acfc87fae86a0a9f7c3be76c29c1a
parent 2b6217ee17808fda3231bdea0f4c27d7b72ed113

Merge "Compiler-rt libraries now use i386 instead of i686" am: b5751e4bd7
am: 2b6217ee17

Change-Id: I2fb5e67a19a5ea46220ac443f0b72873a16cd704

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