diff options
| author | Xing Xue <xingxue@outlook.com> | 2019-05-06 17:45:21 +0000 |
|---|---|---|
| committer | Xing Xue <xingxue@outlook.com> | 2019-05-06 17:45:21 +0000 |
| commit | 865a39d328c2fa0ce251447bf2d6005dbbfec595 (patch) | |
| tree | 70ebe2bb603c1015f042d7319665610d9f3c6b82 /compiler-rt/test | |
| parent | a64bd09ec44a7fc86a95f4b4ab77fbb700a84b48 (diff) | |
| download | llvm-865a39d328c2fa0ce251447bf2d6005dbbfec595.zip llvm-865a39d328c2fa0ce251447bf2d6005dbbfec595.tar.gz llvm-865a39d328c2fa0ce251447bf2d6005dbbfec595.tar.bz2 | |
Add libc++ to link XRay test cases if libc++ is used to build CLANG
Summary: When libc++ is used to build CLANG, its XRay libraries libclang_rt.xray-*.a have dependencies on libc++. Therefore, libc++ is needed to link and run XRay test cases. For Linux -rpath is also needed to specify where to load libc++. This change sets macro LLVM_LIBCXX_USED to 1 if libc++ is actually used in the build. XRay tests then check the flag and add -L<llvm_shlib_dir> -lc++ and -Wl,-rpath=<llvm_shlib_dir> if needed.
Reviewers: hubert.reinterpretcast, amyk, dberris, jasonliu, sfertile, EricWF
Subscribers: dberris, mgorny, jsji, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D61016
llvm-svn: 360060
Diffstat (limited to 'compiler-rt/test')
| -rw-r--r-- | compiler-rt/test/lit.common.configured.in | 1 | ||||
| -rw-r--r-- | compiler-rt/test/xray/lit.cfg | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in index d43597b..3514760 100644 --- a/compiler-rt/test/lit.common.configured.in +++ b/compiler-rt/test/lit.common.configured.in @@ -49,6 +49,7 @@ else: set_default("target_suffix", "-%s" % config.target_arch) set_default("have_zlib", "@HAVE_LIBZ@") +set_default("libcxx_used", "@LLVM_LIBCXX_USED@") # LLVM tools dir can be passed in lit parameters, so try to # apply substitution. diff --git a/compiler-rt/test/xray/lit.cfg b/compiler-rt/test/xray/lit.cfg index 0dc2108..cc4cc21 100644 --- a/compiler-rt/test/xray/lit.cfg +++ b/compiler-rt/test/xray/lit.cfg @@ -10,8 +10,16 @@ config.test_source_root = os.path.dirname(__file__) # Setup default compiler flags use with -fxray-instrument option. clang_xray_cflags = (['-fxray-instrument', config.target_cflags]) -clang_xray_cxxflags = config.cxx_mode_flags + clang_xray_cflags +# If libc++ was used to build XRAY libraries, libc++ is needed. Fix applied +# to Linux only since -rpath may not be portable. This can be extended to +# other platforms. +if config.libcxx_used == "1" and config.host_os == "Linux": + clang_xray_cflags = clang_xray_cflags + (['-L%s -lc++ -Wl,-rpath=%s' + % (config.llvm_shlib_dir, + config.llvm_shlib_dir)]) + +clang_xray_cxxflags = config.cxx_mode_flags + clang_xray_cflags def build_invocation(compile_flags): return ' ' + ' '.join([config.clang] + compile_flags) + ' ' |