diff options
| author | Dan Albert <danalbert@google.com> | 2015-01-25 16:20:57 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-04-01 19:03:22 -0700 |
| commit | 343ed674e35ae0911542abe67dca3fb3a1cccf95 (patch) | |
| tree | ed945008efc80e6f54672120398999962744c186 /core/clang | |
| parent | 24a71e1565d48d6b5f9cdbd12e4cb279ae7e18bb (diff) | |
| download | build-343ed674e35ae0911542abe67dca3fb3a1cccf95.zip build-343ed674e35ae0911542abe67dca3fb3a1cccf95.tar.gz build-343ed674e35ae0911542abe67dca3fb3a1cccf95.tar.bz2 | |
Use prebuilt libclang_rt.profile.
Bug: 17574078
Change-Id: I4838cd5d125a0b2bf76aad2fdaef1ee3122687e8
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/HOST_x86.mk | 2 | ||||
| -rw-r--r-- | core/clang/HOST_x86_64.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_arm.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_arm64.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_mips.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_mips64.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_x86.mk | 2 | ||||
| -rw-r--r-- | core/clang/TARGET_x86_64.mk | 2 | ||||
| -rw-r--r-- | core/clang/config.mk | 1 |
9 files changed, 17 insertions, 0 deletions
diff --git a/core/clang/HOST_x86.mk b/core/clang/HOST_x86.mk index 35cfe60..f14a9c3 100644 --- a/core/clang/HOST_x86.mk +++ b/core/clang/HOST_x86.mk @@ -76,3 +76,5 @@ $(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_CPPFLAGS := \ $(clang_2nd_arch_prefix)CLANG_HOST_GLOBAL_LDFLAGS := \ $(call $(clang_2nd_arch_prefix)convert-to-host-clang-flags,$($(clang_2nd_arch_prefix)HOST_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_x86_HOST_EXTRA_LDFLAGS) + +$(clang_2nd_arch_prefix)HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686.a diff --git a/core/clang/HOST_x86_64.mk b/core/clang/HOST_x86_64.mk index c546715..1211e73 100644 --- a/core/clang/HOST_x86_64.mk +++ b/core/clang/HOST_x86_64.mk @@ -76,3 +76,5 @@ CLANG_HOST_GLOBAL_CPPFLAGS := \ CLANG_HOST_GLOBAL_LDFLAGS := \ $(call convert-to-host-clang-flags,$(HOST_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_x86_64_HOST_EXTRA_LDFLAGS) + +HOST_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64.a diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index 993755f..6f6d624 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -64,3 +64,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi + +$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-arm-android.a diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index ba6e5f1..b67d458 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -62,3 +62,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := aarch64-linux-android + +TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-aarch64-android.a diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index 2360181..19bbaf2 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -63,3 +63,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mipsel-linux-android + +$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mipsel-android.a diff --git a/core/clang/TARGET_mips64.mk b/core/clang/TARGET_mips64.mk index 742be4b..104fb70 100644 --- a/core/clang/TARGET_mips64.mk +++ b/core/clang/TARGET_mips64.mk @@ -62,3 +62,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mips64el-linux-android + +TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-mips64el-android.a diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index 3ba34ae..4e9e8be 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -72,3 +72,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android + +$(clang_2nd_arch_prefix)TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-i686-android.a diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk index 9f8e8b0..e44382d 100644 --- a/core/clang/TARGET_x86_64.mk +++ b/core/clang/TARGET_x86_64.mk @@ -62,3 +62,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ RS_TRIPLE := aarch64-linux-android RS_TRIPLE_CFLAGS := -D__x86_64__ RS_COMPAT_TRIPLE := x86_64-linux-android + +TARGET_LIBPROFILE_RT := $(LLVM_RTLIB_PATH)/libclang_rt.profile-x86_64-android.a diff --git a/core/clang/config.mk b/core/clang/config.mk index 60889e7..ba48f63 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -8,6 +8,7 @@ endif LLVM_PREBUILTS_VERSION := 3.6 LLVM_PREBUILTS_PATH := prebuilts/clang/$(BUILD_OS)-x86/host/$(LLVM_PREBUILTS_VERSION)/bin +LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/ CLANG := $(LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX) CLANG_CXX := $(LLVM_PREBUILTS_PATH)/clang++$(BUILD_EXECUTABLE_SUFFIX) |