From 515fc27b9e87c78514a6ccc5958272e822cfd9d5 Mon Sep 17 00:00:00 2001 From: Kamil Rytarowski Date: Fri, 16 Feb 2018 01:16:06 +0000 Subject: [PATCH] Revert part of SVN r. 325240 in lit.cfg The original change broke a llvm-clang-lld-x86_64-debian setup. This change will be investigated and reintroduced in future. Original commit: "Add Xray instrumentation support to FreeBSD" https://reviews.llvm.org/D43278 llvm-svn: 325309 --- compiler-rt/test/xray/lit.cfg | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/compiler-rt/test/xray/lit.cfg b/compiler-rt/test/xray/lit.cfg index c0eeea0cf074..d5e40975da56 100644 --- a/compiler-rt/test/xray/lit.cfg +++ b/compiler-rt/test/xray/lit.cfg @@ -20,13 +20,6 @@ def build_invocation(compile_flags): llvm_xray = os.path.join(config.llvm_tools_dir, 'llvm-xray') # Setup substitutions. -xraylib_flags = '-lm -pthread -lrt' -if config.host_os == 'Linux': - xraylib_flags += ' -ldl' - -xraylib_flags += ' -L%s -Wl,-whole-archive -lclang_rt.xray-%s ' -'-Wl,-no-whole-archive' - config.substitutions.append( ('%clang ', build_invocation([config.target_cflags]))) config.substitutions.append( @@ -40,13 +33,14 @@ config.substitutions.append( ('%llvm_xray', llvm_xray)) config.substitutions.append( ('%xraylib', - (xraylib_flags) + ('-lm -lpthread -ldl -lrt -L%s ' + '-Wl,-whole-archive -lclang_rt.xray-%s -Wl,-no-whole-archive') % (config.compiler_rt_libdir, config.host_arch))) # Default test suffixes. config.suffixes = ['.c', '.cc', '.cpp'] -if config.host_os not in ['Linux', 'FreeBSD']: +if config.host_os not in ['Linux']: config.unsupported = True elif '64' not in config.host_arch: if 'arm' in config.host_arch: