diff options
| author | Stephen Hines <srhines@google.com> | 2018-10-02 16:19:42 +0000 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2018-10-02 16:19:42 +0000 |
| commit | 80e7d65a42b8f74ae10967f54541b40b2097ebd4 (patch) | |
| tree | 171829db526fd46dd94063fe5e6b78df57c48f83 /compiler-rt/lib/scudo | |
| parent | 860cb5c071e625cfb037b48d5396a69eba48c8e0 (diff) | |
| download | bcm5719-llvm-80e7d65a42b8f74ae10967f54541b40b2097ebd4.tar.gz bcm5719-llvm-80e7d65a42b8f74ae10967f54541b40b2097ebd4.zip | |
[sanitizer] Use -Wl,-z,global on Android for sanitizers except UBsan
Summary:
This essentially reverts r337010 since it breaks UBSan, which is used
for a few platform libraries. The "-z global" flag is now added for
Scudo as well. The only other sanitizer shared libraries are for asan
and hwasan, which have also been reinstated to use the global flag.
Reviewers: cryptoad, eugenis
Reviewed By: cryptoad
Subscribers: kubamracek, mgorny, delcypher, #sanitizers, nickdesaulniers, chh, kongyi, pirama, llvm-commits
Differential Revision: https://reviews.llvm.org/D52770
llvm-svn: 343599
Diffstat (limited to 'compiler-rt/lib/scudo')
| -rw-r--r-- | compiler-rt/lib/scudo/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/compiler-rt/lib/scudo/CMakeLists.txt b/compiler-rt/lib/scudo/CMakeLists.txt index 0646c3dd4f5..79f69e934f2 100644 --- a/compiler-rt/lib/scudo/CMakeLists.txt +++ b/compiler-rt/lib/scudo/CMakeLists.txt @@ -17,6 +17,14 @@ set(SCUDO_DYNAMIC_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS}) # Use gc-sections by default to avoid unused code being pulled in. list(APPEND SCUDO_DYNAMIC_LINK_FLAGS -Wl,--gc-sections) +if(ANDROID) +# Put most Sanitizer shared libraries in the global group. For more details, see +# android-changes-for-ndk-developers.md#changes-to-library-search-order + if (COMPILER_RT_HAS_Z_GLOBAL) + list(APPEND SCUDO_DYNAMIC_LINK_FLAGS -Wl,-z,global) + endif() +endif() + # The minimal Scudo runtime does not inlude the UBSan runtime. set(SCUDO_MINIMAL_OBJECT_LIBS RTSanitizerCommonNoTermination |
