summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDongkyun Son <dongkyun.s@samsung.com>2019-10-16 10:53:36 +0900
committerDongkyun Son <dongkyun.s@samsung.com>2019-10-16 10:53:36 +0900
commita5ca6b5aa97e4a817adeb559b1fc3b8ac84ac4e0 (patch)
tree2cb4b1afcc39cf436bf530c6c6ce25aa514eb2f5
parentc4c19b84a37bbc750e2cc13570dd096b13abfff0 (diff)
downloadcoreclr-a5ca6b5aa97e4a817adeb559b1fc3b8ac84ac4e0.tar.gz
coreclr-a5ca6b5aa97e4a817adeb559b1fc3b8ac84ac4e0.tar.bz2
coreclr-a5ca6b5aa97e4a817adeb559b1fc3b8ac84ac4e0.zip
Revert "[Tizen] Enable Tizen ASan runtime support"
This reverts commit 625a1492ef192853c4a1e661dbb1fee3ebce9f41.
-rw-r--r--configurecompiler.cmake11
-rwxr-xr-xpackaging/coreclr.spec4
2 files changed, 1 insertions, 14 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake
index 423bb40129..eb817ef6b1 100644
--- a/configurecompiler.cmake
+++ b/configurecompiler.cmake
@@ -300,17 +300,6 @@ elseif (CLR_CMAKE_PLATFORM_UNIX)
message(FATAL_ERROR "Unknown build type! Set CMAKE_BUILD_TYPE to DEBUG, CHECKED, RELEASE, or RELWITHDEBINFO!")
endif ()
- if(DEFINED ENV{TIZEN_ASAN_ENVIRONMENT})
- if (CLR_CMAKE_PLATFORM_UNIX_ARM OR CLR_CMAKE_PLATFORM_UNIX_AMD64)
- message(STATUS "TIZEN_ASAN_ENVIRONMENT is enabled.")
- # add definitions to enable ASan support for only external libraries (supported only Tizen)
- add_definitions(-DTIZEN_ASAN_ENVIRONMENT -DHAS_ADDRESS_SANITIZER)
- set(TIZEN_ASAN_ENVIRONMENT 1)
- else()
- message(STATUS "TIZEN_ASAN_ENVIRONMENT cannot be enabled. Current arch is not supported.")
- endif()
- endif()
-
# set the CLANG sanitizer flags for debug build
if(UPPERCASE_CMAKE_BUILD_TYPE STREQUAL DEBUG OR UPPERCASE_CMAKE_BUILD_TYPE STREQUAL CHECKED)
# obtain settings from running enablesanitizers.sh
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 7c7abcdc47..ef9001cf4f 100755
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -148,9 +148,7 @@ done
export ASAN_OPTIONS=use_sigaltstack=false:`cat /ASAN_OPTIONS`
/usr/bin/gcc-unforce-options
export LD_LIBRARY_PATH=`pwd`/libicu-57.1
-
-# enable ASan support for only external libs
-export TIZEN_ASAN_ENVIRONMENT=1
+export CPPFLAGS+=" -DHAS_ADDRESS_SANITIZER "
}
export CFLAGS=" --target=%{_host} "