summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-07-22 23:31:50 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2015-07-22 23:31:50 +0000
commitabb966d57e31932b61d5aed28bb806448aaaff5a (patch)
tree2e551ecffc9d8c1ea9d35f52377a0eaf3acfd03c
parent9ccfddc39d4d27f9b16fcc72ab30d483151d6d08 (diff)
downloadbcm5719-llvm-abb966d57e31932b61d5aed28bb806448aaaff5a.tar.gz
bcm5719-llvm-abb966d57e31932b61d5aed28bb806448aaaff5a.zip
[asan] Enable build of asan-rt on android/aarch64.
llvm-svn: 242966
-rw-r--r--compiler-rt/cmake/config-ix.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake
index 8daed90c8cc..9943ea384b4 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -222,7 +222,7 @@ message(STATUS "Compiler-RT supported architectures: ${COMPILER_RT_SUPPORTED_ARC
# Takes ${ARGN} and puts only supported architectures in @out_var list.
function(filter_available_targets out_var)
- set(archs)
+ set(archs ${${out_var}})
foreach(arch ${ARGN})
list(FIND COMPILER_RT_SUPPORTED_ARCH ${arch} ARCH_INDEX)
if(NOT (ARCH_INDEX EQUAL -1) AND CAN_TARGET_${arch})
@@ -253,6 +253,9 @@ filter_available_targets(UBSAN_COMMON_SUPPORTED_ARCH
${SANITIZER_COMMON_SUPPORTED_ARCH})
filter_available_targets(ASAN_SUPPORTED_ARCH
x86_64 i386 i686 powerpc64 powerpc64le arm mips mipsel mips64 mips64el)
+if(ANDROID)
+ filter_available_targets(ASAN_SUPPORTED_ARCH aarch64)
+endif()
filter_available_targets(DFSAN_SUPPORTED_ARCH x86_64 mips64 mips64el)
filter_available_targets(LSAN_SUPPORTED_ARCH x86_64 mips64 mips64el)
filter_available_targets(MSAN_SUPPORTED_ARCH x86_64 mips64 mips64el)
OpenPOWER on IntegriCloud