Support for multiarch runtimes layout

This change adds a support for multiarch style runtimes layout, so in
addition to the existing layout where runtimes get installed to:

lib/clang/$version/lib/$os

Clang now allows runtimes to be installed to:

lib/clang/$version/$target/lib

This also includes libc++, libc++abi and libunwind; today those are
assumed to be in Clang library directory built for host, with the
new layout it is possible to install libc++, libc++abi and libunwind
into the runtime directory built for different targets.

The use of new layout is enabled by setting the
LLVM_ENABLE_RUNTIME_TARGET_DIR CMake variable and is supported by both
projects and runtimes layouts. The runtimes CMake build has been further
modified to use the new layout when building runtimes for multiple
targets.

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

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@335809 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 2 insertions, 5 deletions

diff --git a/test/xray/lit.cfg b/test/xray/lit.cfg
index 7369f6a76..ecc6d6af9 100644
--- a/test/xray/lit.cfg
+++ b/test/xray/lit.cfg
@@ -18,9 +18,6 @@ def build_invocation(compile_flags):
 
 # Assume that llvm-xray is in the config.llvm_tools_dir.
 llvm_xray = os.path.join(config.llvm_tools_dir, 'llvm-xray')
-host_arch = config.host_arch
-if host_arch == 'amd64':
-  host_arch = 'x86_64'
 
 # Setup substitutions.
 if config.host_os == "Linux":
@@ -42,8 +39,8 @@ config.substitutions.append(
 config.substitutions.append(
     ('%xraylib',
         ('-lm -lpthread %s -lrt -L%s '
-         '-Wl,-whole-archive -lclang_rt.xray-%s -Wl,-no-whole-archive')
-        % (libdl_flag, config.compiler_rt_libdir, host_arch)))
+         '-Wl,-whole-archive -lclang_rt.xray%s -Wl,-no-whole-archive')
+        % (libdl_flag, config.compiler_rt_libdir, config.target_suffix)))
 
 # Default test suffixes.
 config.suffixes = ['.c', '.cc', '.cpp']