diff options
| author | Kostya Kortchinsky <kostyak@google.com> | 2018-04-16 18:17:22 +0000 |
|---|---|---|
| committer | Kostya Kortchinsky <kostyak@google.com> | 2018-04-16 18:17:22 +0000 |
| commit | 25eae5c8796d397b5cf4ea15866ae1e71a86cfcd (patch) | |
| tree | 7ad3400edf9c7f7ba23974dfc79e91e9865f1ae3 | |
| parent | e3fe6698559f80a79286980e6b2a4c291c5e7585 (diff) | |
| download | bcm5719-llvm-25eae5c8796d397b5cf4ea15866ae1e71a86cfcd.tar.gz bcm5719-llvm-25eae5c8796d397b5cf4ea15866ae1e71a86cfcd.zip | |
[sanitizer] Fix OSX build failure post D45457
Summary:
It looks like OSX's UBSan needs a "NoHooks" version of
`RTSanitizerCommonSymbolizer` to work build properly.
Subscribers: kubamracek, mgorny, delcypher, llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D45696
llvm-svn: 330146
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt index e37fe1b18c0..949b55a67a8 100644 --- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt @@ -241,6 +241,12 @@ add_compiler_rt_object_libraries(RTSanitizerCommonLibcNoHooks SOURCES ${SANITIZER_LIBCDEP_SOURCES} CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} DEFS ${SANITIZER_COMMON_DEFINITIONS}) +add_compiler_rt_object_libraries(RTSanitizerCommonSymbolizerNoHooks + ${OS_OPTION} + ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH} + SOURCES ${SANITIZER_SYMBOLIZER_SOURCES} + CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} + DEFS ${SANITIZER_COMMON_DEFINITIONS}) if(OS_NAME MATCHES "SunOS") # Solaris ld doesn't support the non-standard GNU ld extension of adding diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt index 5e5eb7dca15..183f3ff567e 100644 --- a/compiler-rt/lib/ubsan/CMakeLists.txt +++ b/compiler-rt/lib/ubsan/CMakeLists.txt @@ -91,7 +91,7 @@ if(APPLE) RTSanitizerCommonNoHooks RTSanitizerCommonLibcNoHooks RTSanitizerCommonCoverage - RTSanitizerCommonSymbolizer + RTSanitizerCommonSymbolizerNoHooks RTInterception LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS} PARENT_TARGET ubsan) |
