diff options
| -rw-r--r-- | compiler-rt/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | compiler-rt/test/lit.common.cfg | 4 | ||||
| -rw-r--r-- | compiler-rt/test/lit.common.configured.in | 1 | ||||
| -rw-r--r-- | llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn | 1 |
4 files changed, 7 insertions, 0 deletions
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 0b64babef5a..9c9df7b951d 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -186,6 +186,7 @@ option(COMPILER_RT_INTERCEPT_LIBDISPATCH if (APPLE) # Always enable on Apple platforms. set(COMPILER_RT_INTERCEPT_LIBDISPATCH ON) endif() +pythonize_bool(COMPILER_RT_INTERCEPT_LIBDISPATCH) if(APPLE AND SANITIZER_MIN_OSX_VERSION AND SANITIZER_MIN_OSX_VERSION VERSION_LESS "10.9") # Mac OS X prior to 10.9 had problems with exporting symbols from diff --git a/compiler-rt/test/lit.common.cfg b/compiler-rt/test/lit.common.cfg index ed556a7cbe9..1f67e5a2b0c 100644 --- a/compiler-rt/test/lit.common.cfg +++ b/compiler-rt/test/lit.common.cfg @@ -222,6 +222,10 @@ compiler_rt_debug = getattr(config, 'compiler_rt_debug', False) if not compiler_rt_debug: config.available_features.add('compiler-rt-optimized') +dispatch = getattr(config, 'compiler_rt_intercept_libdispatch') +if dispatch: + config.available_features.add('dispatch') + sanitizer_can_use_cxxabi = getattr(config, 'sanitizer_can_use_cxxabi', True) if sanitizer_can_use_cxxabi: config.available_features.add('cxxabi') diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in index e1884b409e5..d43597b0679 100644 --- a/compiler-rt/test/lit.common.configured.in +++ b/compiler-rt/test/lit.common.configured.in @@ -24,6 +24,7 @@ set_default("clang", "@COMPILER_RT_RESOLVED_TEST_COMPILER@") set_default("compiler_id", "@COMPILER_RT_TEST_COMPILER_ID@") set_default("python_executable", "@PYTHON_EXECUTABLE@") set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@) +set_default("compiler_rt_intercept_libdispatch", @COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL@) set_default("compiler_rt_libdir", "@COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR@") set_default("emulator", "@COMPILER_RT_EMULATOR@") set_default("asan_shadow_scale", "@COMPILER_RT_ASAN_SHADOW_SCALE@") diff --git a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn index a5fa1a3f9fb..37898e2e90f 100644 --- a/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn +++ b/llvm/utils/gn/secondary/compiler-rt/test/BUILD.gn @@ -40,6 +40,7 @@ write_cmake_config("lit_common_configured") { "COMPILER_RT_TEST_COMPILER_ID=Clang", "PYTHON_EXECUTABLE=$python_path", "COMPILER_RT_DEBUG_PYBOOL=False", + "COMPILER_RT_INTERCEPT_LIBDISPATCH_PYBOOL=False", "COMPILER_RT_RESOLVED_LIBRARY_OUTPUT_DIR=" + rebase_path(crt_current_out_dir), "COMPILER_RT_EMULATOR=", |
