Skip to content

[TYSan][CMake] CMake build fixes #121224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 30, 2024
Merged

[TYSan][CMake] CMake build fixes #121224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653109e
[TYSan][CMake] CMake build fixes
petrhosek Dec 27, 2024
bc154bb
More fixes
petrhosek Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions compiler-rt/lib/tysan/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,25 @@ include_directories(..)
# Runtime library sources and build flags.
set(TYSAN_SOURCES
tysan.cpp
tysan_interceptors.cpp)
tysan_interceptors.cpp
)

SET(TYSAN_HEADERS
tysan.h
tysan_flags.inc
tysan_platform.h
)

set(TYSAN_COMMON_CFLAGS ${SANITIZER_COMMON_CFLAGS})
append_rtti_flag(OFF TYSAN_COMMON_CFLAGS)
# Prevent clang from generating libc calls.
append_list_if(COMPILER_RT_HAS_FFREESTANDING_FLAG -ffreestanding TYSAN_COMMON_CFLAGS)
set(TYSAN_DYNAMIC_CFLAGS ${TYSAN_COMMON_CFLAGS})

set(TYSAN_COMMON_DEFINITIONS "")
set(TYSAN_DYNAMIC_DEFINITIONS ${TYSAN_COMMON_DEFINITIONS} TYSAN_DYNAMIC=1)

# Compile TYSan sources into an object library.

add_compiler_rt_object_libraries(RTTysan_dynamic
OS ${SANITIZER_COMMON_SUPPORTED_OS}
Expand Down Expand Up @@ -47,17 +61,18 @@ if(APPLE)
DEFS ${TYSAN_COMMON_DEFINITIONS}
PARENT_TARGET tysan)
else()
set(TYSAN_CFLAGS ${TYSAN_COMMON_CFLAGS})
append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TYSAN_CFLAGS)

foreach(arch ${TYSAN_SUPPORTED_ARCH})
set(TYSAN_CFLAGS ${TYSAN_COMMON_CFLAGS})
append_list_if(COMPILER_RT_HAS_FPIE_FLAG -fPIE TYSAN_CFLAGS)
add_compiler_rt_runtime(clang_rt.tysan
STATIC
ARCHS ${arch}
SOURCES ${TYSAN_SOURCES}
$<TARGET_OBJECTS:RTInterception.${arch}>
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
OBJECT_LIBS RTInterception
RTSanitizerCommon
RTSanitizerCommonLibc
RTSanitizerCommonSymbolizer
CFLAGS ${TYSAN_CFLAGS}
PARENT_TARGET tysan)
endforeach()
Expand Down
Loading