[CMake] Support compiler-rt builtins library in tests
We're building tests with -nostdlib which means that we need to
explicitly include the builtins library. When using libgcc (default)
we can simply include -lgcc_s on the link line, but when using
compiler-rt builtins we need a complete path to the builtins library.
This path is already available in CMake as <PROJECT>_BUILTINS_LIBRARY,
so we just need to pass that path to lit and if config.compiler_rt is
true, link it to the test.
Prior to this patch, running tests when compiler-rt is being used as
the builtins library was broken as all tests would fail to link, but
with this change running tests when compiler-rt bultins library is
being used should be supported.
Differential Revision: https://reviews.llvm.org/D56701
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@353208 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/docs/TestingLibcxx.rst b/docs/TestingLibcxx.rst
index ebbbf62..d8060fe 100644
--- a/docs/TestingLibcxx.rst
+++ b/docs/TestingLibcxx.rst
@@ -183,6 +183,14 @@
option is specified or the environment variable LIBCXX_COLOR_DIAGNOSTICS is
present then color diagnostics will be enabled.
+.. option:: llvm_unwinder
+
+ Enable the use of LLVM unwinder instead of libgcc.
+
+.. option:: builtins_library
+
+ Path to the builtins library to use instead of libgcc.
+
Environment Variables
---------------------
diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in
index 019cca8..ed9a711 100644
--- a/test/lit.site.cfg.in
+++ b/test/lit.site.cfg.in
@@ -27,7 +27,7 @@
config.executor = "@LIBCXX_EXECUTOR@"
config.llvm_unwinder = @LIBCXXABI_USE_LLVM_UNWINDER@
-config.compiler_rt = @LIBCXX_USE_COMPILER_RT@
+config.builtins_library = "@LIBCXX_BUILTINS_LIBRARY@"
config.has_libatomic = @LIBCXX_HAS_ATOMIC_LIB@
config.use_libatomic = @LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB@
config.debug_build = @LIBCXX_DEBUG_BUILD@
diff --git a/utils/libcxx/test/target_info.py b/utils/libcxx/test/target_info.py
index fb45080..2ea24d6 100644
--- a/utils/libcxx/test/target_info.py
+++ b/utils/libcxx/test/target_info.py
@@ -251,8 +251,10 @@
flags += ['-lunwind', '-ldl']
else:
flags += ['-lgcc_s']
- compiler_rt = self.full_config.get_lit_bool('compiler_rt', False)
- if not compiler_rt:
+ builtins_lib = self.full_config.get_lit_conf('builtins_library')
+ if builtins_lib:
+ flags += [builtins_lib]
+ else:
flags += ['-lgcc']
use_libatomic = self.full_config.get_lit_bool('use_libatomic', False)
if use_libatomic:
