From a97c8523f53fa7dae675a931fec566f3ebc47de5 Mon Sep 17 00:00:00 2001 From: Jason Tang Date: Sun, 17 Jan 2021 16:57:26 -0500 Subject: [PATCH] SWDEV-268345 - Enable address sanitizer build when ADDRESS_SANITIZER is ON Change-Id: Iaef46358f33a399f8b047aaebc5154bb7352a69a [ROCm/clr commit: 8d75c7e76f139d919401cb56da4fdd8c732a8843] --- projects/clr/opencl/CMakeLists.txt | 5 +++++ projects/clr/opencl/tools/cltrace/CMakeLists.txt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 563c591bde..34a2af95d0 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -17,6 +17,11 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") option(BUILD_SHARED_LIBS "Build shared libs" ON) +option(ADDRESS_SANITIZER "Build Address Sanitizer" OFF) +if (ADDRESS_SANITIZER) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address") +endif() + #set a name for icd file set(OPENCL_AMD_ICD_FILE "amdocl64.icd") if (DEFINED ROCM_PATCH_VERSION) diff --git a/projects/clr/opencl/tools/cltrace/CMakeLists.txt b/projects/clr/opencl/tools/cltrace/CMakeLists.txt index ec867f2219..992bdfd568 100644 --- a/projects/clr/opencl/tools/cltrace/CMakeLists.txt +++ b/projects/clr/opencl/tools/cltrace/CMakeLists.txt @@ -5,6 +5,10 @@ endif() set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-Bsymbolic -Wl,--unresolved-symbols=report-all -Wl,--version-script=${CMAKE_CURRENT_LIST_DIR}/cltrace.map") +if (ADDRESS_SANITIZER) + set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared-libasan") +endif() + include_directories(${CMAKE_CURRENT_LIST_DIR}/../../) include_directories(${CMAKE_CURRENT_LIST_DIR}/../../khronos/headers/opencl2.2)