diff options
| -rw-r--r-- | compiler-rt/lib/asan/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/msan/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler-rt/lib/ubsan/CMakeLists.txt | 17 |
3 files changed, 20 insertions, 13 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt index 5a2ce5466cf..b590ffc3f25 100644 --- a/compiler-rt/lib/asan/CMakeLists.txt +++ b/compiler-rt/lib/asan/CMakeLists.txt @@ -103,9 +103,11 @@ else() SOURCES ${ASAN_SOURCES} ${ASAN_SOURCE_LIBS} CFLAGS ${ASAN_CFLAGS} DEFS ${ASAN_COMMON_DEFINITIONS}) - add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra) - list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch} - clang_rt.asan-${arch}-symbols) + list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}) + if (UNIX AND NOT ${arch} STREQUAL "i386") + add_sanitizer_rt_symbols(clang_rt.asan-${arch} asan.syms.extra) + list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-${arch}-symbols) + endif() if (WIN32) add_compiler_rt_static_runtime(clang_rt.asan_dll_thunk-${arch} ${arch} diff --git a/compiler-rt/lib/msan/CMakeLists.txt b/compiler-rt/lib/msan/CMakeLists.txt index 98c29614884..06f3f65d8e3 100644 --- a/compiler-rt/lib/msan/CMakeLists.txt +++ b/compiler-rt/lib/msan/CMakeLists.txt @@ -26,9 +26,11 @@ if(CAN_TARGET_${arch}) $<TARGET_OBJECTS:RTSanitizerCommon.${arch}> $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}> CFLAGS ${MSAN_RTL_CFLAGS}) - add_sanitizer_rt_symbols(clang_rt.msan-${arch} msan.syms.extra) - list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch} - clang_rt.msan-${arch}-symbols) + list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}) + if(UNIX) + add_sanitizer_rt_symbols(clang_rt.msan-${arch} msan.syms.extra) + list(APPEND MSAN_RUNTIME_LIBRARIES clang_rt.msan-${arch}-symbols) + endif() endif() add_compiler_rt_resource_file(msan_blacklist msan_blacklist.txt) diff --git a/compiler-rt/lib/ubsan/CMakeLists.txt b/compiler-rt/lib/ubsan/CMakeLists.txt index 6a9c8c37ce4..675c47f6a65 100644 --- a/compiler-rt/lib/ubsan/CMakeLists.txt +++ b/compiler-rt/lib/ubsan/CMakeLists.txt @@ -35,18 +35,21 @@ else() add_compiler_rt_static_runtime(clang_rt.ubsan-${arch} ${arch} SOURCES ${UBSAN_SOURCES} CFLAGS ${UBSAN_CFLAGS}) - add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra) # C++-specific parts of UBSan runtime. Requires a C++ ABI library. add_compiler_rt_static_runtime(clang_rt.ubsan_cxx-${arch} ${arch} SOURCES ${UBSAN_CXX_SOURCES} CFLAGS ${UBSAN_CFLAGS}) - add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra) list(APPEND UBSAN_RUNTIME_LIBRARIES - clang_rt.san-${arch} - clang_rt.ubsan-${arch} - clang_rt.ubsan-${arch}-symbols - clang_rt.ubsan_cxx-${arch} - clang_rt.ubsan_cxx-${arch}-symbols) + clang_rt.san-${arch} + clang_rt.ubsan-${arch} + clang_rt.ubsan_cxx-${arch}) + if (UNIX AND NOT ${arch} STREQUAL "i386") + add_sanitizer_rt_symbols(clang_rt.ubsan-${arch} ubsan.syms.extra) + add_sanitizer_rt_symbols(clang_rt.ubsan_cxx-${arch} ubsan.syms.extra) + list(APPEND UBSAN_RUNTIME_LIBRARIES + clang_rt.ubsan-${arch}-symbols + clang_rt.ubsan_cxx-${arch}-symbols) + endif() endforeach() endif() |
