[compiler-rt] r375472 - Fix lld detection in standalone compiler-rt.

[Diana Picus via llvm-commits]

Hi Evgeniy,

I think this broke one of our buildbots:
http://lab.llvm.org:8011/builders/clang-cmake-thumbv7-full-sh/builds/2863

Could you please have a look?

Thanks,
Diana

On Tue, 22 Oct 2019 at 01:57, Evgeniy Stepanov via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
>
> Author: eugenis
> Date: Mon Oct 21 16:59:45 2019
> New Revision: 375472
>
> URL: http://llvm.org/viewvc/llvm-project?rev=375472&view=rev
> Log:
> Fix lld detection in standalone compiler-rt.
>
> Summary:
> Right now all hwasan tests on Android are silently disabled because they
> require "has_lld" and standalone compiler-rt can not (and AFAIK was
> never able to) set it.
>
> Reviewers: pcc, dyung
>
> Subscribers: dberris, mgorny, #sanitizers, llvm-commits
>
> Tags: #sanitizers, #llvm
>
> Differential Revision: https://reviews.llvm.org/D69196
>
> Modified:
>     compiler-rt/trunk/CMakeLists.txt
>     compiler-rt/trunk/cmake/config-ix.cmake
>
> Modified: compiler-rt/trunk/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=375472&r1=375471&r2=375472&view=diff
> ==============================================================================
> --- compiler-rt/trunk/CMakeLists.txt (original)
> +++ compiler-rt/trunk/CMakeLists.txt Mon Oct 21 16:59:45 2019
> @@ -497,7 +497,7 @@ else()
>    if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
>      set(COMPILER_RT_HAS_LLD TRUE)
>    else()
> -    set(COMPILER_RT_HAS_LLD FALSE)
> +    set(COMPILER_RT_HAS_LLD ${COMPILER_RT_HAS_FUSE_LD_LLD_FLAG})
>    endif()
>  endif()
>  pythonize_bool(COMPILER_RT_HAS_LLD)
>
> Modified: compiler-rt/trunk/cmake/config-ix.cmake
> URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/config-ix.cmake?rev=375472&r1=375471&r2=375472&view=diff
> ==============================================================================
> --- compiler-rt/trunk/cmake/config-ix.cmake (original)
> +++ compiler-rt/trunk/cmake/config-ix.cmake Mon Oct 21 16:59:45 2019
> @@ -146,6 +146,7 @@ check_library_exists(stdc++ __cxa_throw
>
>  # Linker flags.
>  check_linker_flag("-Wl,-z,text" COMPILER_RT_HAS_Z_TEXT)
> +check_linker_flag("-fuse-ld=lld" COMPILER_RT_HAS_FUSE_LD_LLD_FLAG)
>
>  if(ANDROID)
>    check_linker_flag("-Wl,-z,global" COMPILER_RT_HAS_Z_GLOBAL)
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits