LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[libcxx] Support the use of compiler-rt in lit tests

Browse Source 
Don't link tests against libgcc when compiler-rt is being used.

Differential Revision: https://reviews.llvm.org/D40513

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@322044 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Petr Hosek
2018-01-08 23:36:53 +00:00
parent 0e3a508af4
commit 95b20f885c
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/CMakeLists.txt
View File

@@ -30,6 +30,7 @@ pythonize_bool(LIBCXX_BUILD_32_BITS)
pythonize_bool(LIBCXX_GENERATE_COVERAGE) pythonize_bool(LIBCXX_GENERATE_COVERAGE)
pythonize_bool(LIBCXXABI_ENABLE_SHARED) pythonize_bool(LIBCXXABI_ENABLE_SHARED)
pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER) pythonize_bool(LIBCXXABI_USE_LLVM_UNWINDER)
pythonize_bool(LIBCXX_USE_COMPILER_RT)
pythonize_bool(LIBCXX_HAS_ATOMIC_LIB) pythonize_bool(LIBCXX_HAS_ATOMIC_LIB)
pythonize_bool(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB) pythonize_bool(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB)
pythonize_bool(LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) pythonize_bool(LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY)

1
test/lit.site.cfg.in
View File

@@ -24,6 +24,7 @@ config.generate_coverage = "@LIBCXX_GENERATE_COVERAGE@"
config.target_info = "@LIBCXX_TARGET_INFO@" config.target_info = "@LIBCXX_TARGET_INFO@"
config.executor = "@LIBCXX_EXECUTOR@" config.executor = "@LIBCXX_EXECUTOR@"
config.llvm_unwinder = "@LIBCXXABI_USE_LLVM_UNWINDER@" config.llvm_unwinder = "@LIBCXXABI_USE_LLVM_UNWINDER@"
config.compiler_rt = "@LIBCXX_USE_COMPILER_RT@"
config.has_libatomic = "@LIBCXX_HAS_ATOMIC_LIB@" config.has_libatomic = "@LIBCXX_HAS_ATOMIC_LIB@"
config.use_libatomic = "@LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@" config.use_libatomic = "@LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@"
config.debug_build = "@LIBCXX_DEBUG_BUILD@" config.debug_build = "@LIBCXX_DEBUG_BUILD@"

4
utils/libcxx/test/target_info.py
View File

@@ -234,7 +234,9 @@ class LinuxLocalTI(DefaultTargetInfo):
flags += ['-lunwind', '-ldl'] flags += ['-lunwind', '-ldl']
else: else:
flags += ['-lgcc_s'] flags += ['-lgcc_s']
flags += ['-lgcc'] compiler_rt = self.full_config.get_lit_bool('compiler_rt', False)
if not compiler_rt:
flags += ['-lgcc']
use_libatomic = self.full_config.get_lit_bool('use_libatomic', False) use_libatomic = self.full_config.get_lit_bool('use_libatomic', False)
if use_libatomic: if use_libatomic:
flags += ['-latomic'] flags += ['-latomic']