diff options
author | Eric Fiselier <eric@efcs.ca> | 2014-12-12 02:36:23 +0000 |
---|---|---|
committer | Eric Fiselier <eric@efcs.ca> | 2014-12-12 02:36:23 +0000 |
commit | 01f6a1410c6d468a461339a015e2f9419287fed1 (patch) | |
tree | 193e844833ae9a414da9a02f5f8310b943a51a39 | |
parent | 08e3a7887f1e84119c7675402a8c72f49fbc017a (diff) |
Fix building and running tests when LIBCXX_ENABLE_EXCEPTIONS or LIBCXX_ENABLE_RTTI are turned off.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@224095 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | src/memory.cpp | 2 | ||||
-rw-r--r-- | test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | test/lit.cfg | 11 | ||||
-rw-r--r-- | test/lit.site.cfg.in | 2 |
4 files changed, 16 insertions, 1 deletions
diff --git a/src/memory.cpp b/src/memory.cpp index c56d031ad..8a4eb3481 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -111,7 +111,7 @@ __shared_weak_count::lock() _NOEXCEPT return 0; } -#ifndef _LIBCPP_NO_RTTI +#if !defined(_LIBCPP_NO_RTTI) || !defined(_LIBCPP_BUILD_STATIC) const void* __shared_weak_count::__get_deleter(const type_info&) const _NOEXCEPT diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 4c8193eab..0d053b4b0 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -27,6 +27,8 @@ if(PYTHONINTERP_FOUND) set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/..) set(LIBCXX_BINARY_DIR ${CMAKE_BINARY_DIR}) set(PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE}) + pythonize_bool(LIBCXX_ENABLE_EXCEPTIONS) + pythonize_bool(LIBCXX_ENABLE_RTTI) pythonize_bool(LIBCXX_ENABLE_SHARED) pythonize_bool(LIBCXX_ENABLE_THREADS) pythonize_bool(LIBCXX_ENABLE_MONOTONIC_CLOCK) diff --git a/test/lit.cfg b/test/lit.cfg index 6f1303a19..8bad0308e 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -426,6 +426,16 @@ class Configuration(object): self.compile_flags += ['-D__STDC_FORMAT_MACROS', '-D__STDC_LIMIT_MACROS', '-D__STDC_CONSTANT_MACROS'] + enable_exceptions = self.get_lit_bool('enable_exceptions', True) + if enable_exceptions: + self.config.available_features.add('exceptions') + else: + self.compile_flags += ['-fno-exceptions'] + enable_rtti = self.get_lit_bool('enable_rtti', True) + if enable_rtti: + self.config.available_features.add('rtti') + else: + self.compile_flags += ['-fno-rtti', '-D_LIBCPP_NO_RTTI'] # Configure threading features. enable_threads = self.get_lit_bool('enable_threads', True) enable_monotonic_clock = self.get_lit_bool('enable_monotonic_clock', True) @@ -439,6 +449,7 @@ class Configuration(object): self.lit_config.fatal('enable_monotonic_clock cannot be false when' ' enable_threads is true.') + def configure_link_flags(self): # Configure library search paths abi_library_path = self.get_lit_conf('abi_library_path', '') diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index 47e88d8c8..32619717d 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -4,6 +4,8 @@ config.std = "@LIBCXX_STD_VERSION@" config.libcxx_src_root = "@LIBCXX_SOURCE_DIR@" config.libcxx_obj_root = "@LIBCXX_BINARY_DIR@" config.python_executable = "@PYTHON_EXECUTABLE@" +config.enable_exceptions = "@LIBCXX_ENABLE_EXCEPTIONS@" +config.enable_rtti = "@LIBCXX_ENABLE_RTTI@" config.enable_shared = "@LIBCXX_ENABLE_SHARED@" config.enable_threads = "@LIBCXX_ENABLE_THREADS@" config.enable_monotonic_clock = "@LIBCXX_ENABLE_MONOTONIC_CLOCK@" |