[compiler-rt] r242966 - [asan] Enable build of asan-rt on android/aarch64.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Jul 22 18:31:50 2015
New Revision: 242966

URL: http://llvm.org/viewvc/llvm-project?rev=242966&view=rev
Log:
[asan] Enable build of asan-rt on android/aarch64.

Modified:
    compiler-rt/trunk/cmake/config-ix.cmake

Modified: compiler-rt/trunk/cmake/config-ix.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=242966&r1=242965&r2=242966&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/config-ix.cmake (original)
+++ compiler-rt/trunk/cmake/config-ix.cmake Wed Jul 22 18:31:50 2015
@@ -222,7 +222,7 @@ message(STATUS "Compiler-RT supported ar
 
 # 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_SU
   ${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)