[Driver] Change layout of per-target runtimes to resemble multiarch
This is a follow up to r361432, changing the layout of per-target runtimes to more closely resemble multiarch. While before, we used the following layout: [RESOURCE_DIR]/<target>/lib/libclang_rt.<runtime>.<ext> Now we use the following layout: [RESOURCE_DIR]/lib/<target>/libclang_rt.<runtime>.<ext> This also more closely resembles the existing "non-per-target" layout: [RESOURCE_DIR]/lib/<os>/libclang_rt.<runtime>-<arch>.<ext> This change will enable further simplification of the driver logic in follow up changes. Differential Revision: https://reviews.llvm.org/D62469 llvm-svn: 361784
This commit is contained in:
Petr Hosek
parent
82dc06c340
commit
61a5e2833d
|
|
@ -411,13 +411,13 @@ Optional<std::string> ToolChain::getRuntimePath() const {
|
|||
|
||||
// First try the triple passed to driver as --target=<triple>.
|
||||
P.assign(D.ResourceDir);
|
||||
llvm::sys::path::append(P, D.getTargetTriple(), "lib");
|
||||
llvm::sys::path::append(P, "lib", D.getTargetTriple());
|
||||
if (getVFS().exists(P))
|
||||
return llvm::Optional<std::string>(P.str());
|
||||
|
||||
// Second try the normalized triple.
|
||||
P.assign(D.ResourceDir);
|
||||
llvm::sys::path::append(P, Triple.str(), "lib");
|
||||
llvm::sys::path::append(P, "lib", Triple.str());
|
||||
if (getVFS().exists(P))
|
||||
return llvm::Optional<std::string>(P.str());
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@
|
|||
// CHECK-NOT: crti.o
|
||||
// CHECK-NOT: crtbegin.o
|
||||
// CHECK: "-L[[SYSROOT]]{{/|\\\\}}lib"
|
||||
// CHECK-X86_64: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-X86_64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK: "-lc"
|
||||
// CHECK-NOT: crtend.o
|
||||
// CHECK-NOT: crtn.o
|
||||
|
|
@ -57,21 +57,21 @@
|
|||
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
|
||||
// RUN: | FileCheck %s -check-prefix=CHECK-NODEFAULTLIBS
|
||||
// CHECK-NODEFAULTLIBS: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-NODEFAULTLIBS-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NODEFAULTLIBS-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NODEFAULTLIBS-NOT: "-lc"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia -nostdlib -fuse-ld=lld 2>&1 \
|
||||
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
|
||||
// RUN: | FileCheck %s -check-prefix=CHECK-NOSTDLIB
|
||||
// CHECK-NOSTDLIB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-NOSTDLIB-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NOSTDLIB-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NOSTDLIB-NOT: "-lc"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia -nolibc -fuse-ld=lld 2>&1 \
|
||||
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
|
||||
// RUN: | FileCheck %s -check-prefix=CHECK-NOLIBC
|
||||
// CHECK-NOLIBC: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-NOLIBC: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NOLIBC: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK-NOLIBC-NOT: "-lc"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-SAFESTACK
|
||||
// CHECK-SAFESTACK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-SAFESTACK: "-fsanitize=safe-stack"
|
||||
// CHECK-SAFESTACK-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.safestack.a"
|
||||
// CHECK-SAFESTACK-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.safestack.a"
|
||||
// CHECK-SAFESTACK-NOT: "__safestack_init"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
|
|
@ -93,8 +93,8 @@
|
|||
// CHECK-ASAN-X86: "-fsanitize=address"
|
||||
// CHECK-ASAN-X86: "-fsanitize-address-globals-dead-stripping"
|
||||
// CHECK-ASAN-X86: "-dynamic-linker" "asan/ld.so.1"
|
||||
// CHECK-ASAN-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
// CHECK-ASAN-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
|
||||
// RUN: %clang %s -### --target=aarch64-fuchsia \
|
||||
// RUN: -fsanitize=address 2>&1 \
|
||||
|
|
@ -105,8 +105,8 @@
|
|||
// CHECK-ASAN-AARCH64: "-fsanitize=address"
|
||||
// CHECK-ASAN-AARCH64: "-fsanitize-address-globals-dead-stripping"
|
||||
// CHECK-ASAN-AARCH64: "-dynamic-linker" "asan/ld.so.1"
|
||||
// CHECK-ASAN-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
// CHECK-ASAN-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
// RUN: -fsanitize=address -fPIC -shared 2>&1 \
|
||||
|
|
@ -116,8 +116,8 @@
|
|||
// CHECK-ASAN-SHARED: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-ASAN-SHARED: "-fsanitize=address"
|
||||
// CHECK-ASAN-SHARED: "-fsanitize-address-globals-dead-stripping"
|
||||
// CHECK-ASAN-SHARED: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-SHARED-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
// CHECK-ASAN-SHARED: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.asan.so"
|
||||
// CHECK-ASAN-SHARED-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.asan-preinit.a"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
// RUN: -fsanitize=fuzzer 2>&1 \
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-FUZZER-X86
|
||||
// CHECK-FUZZER-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-FUZZER-X86: "-fsanitize=fuzzer,fuzzer-no-link,safe-stack"
|
||||
// CHECK-FUZZER-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.fuzzer.a"
|
||||
// CHECK-FUZZER-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.fuzzer.a"
|
||||
|
||||
// RUN: %clang %s -### --target=aarch64-fuchsia \
|
||||
// RUN: -fsanitize=fuzzer 2>&1 \
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-FUZZER-AARCH64
|
||||
// CHECK-FUZZER-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-FUZZER-AARCH64: "-fsanitize=fuzzer,fuzzer-no-link,safe-stack"
|
||||
// CHECK-FUZZER-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.fuzzer.a"
|
||||
// CHECK-FUZZER-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.fuzzer.a"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
// RUN: -fsanitize=scudo 2>&1 \
|
||||
|
|
@ -145,7 +145,7 @@
|
|||
// CHECK-SCUDO-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-SCUDO-X86: "-fsanitize=safe-stack,scudo"
|
||||
// CHECK-SCUDO-X86: "-pie"
|
||||
// CHECK-SCUDO-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.scudo.so"
|
||||
// CHECK-SCUDO-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.scudo.so"
|
||||
|
||||
// RUN: %clang %s -### --target=aarch64-fuchsia \
|
||||
// RUN: -fsanitize=scudo 2>&1 \
|
||||
|
|
@ -155,7 +155,7 @@
|
|||
// CHECK-SCUDO-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-SCUDO-AARCH64: "-fsanitize=safe-stack,scudo"
|
||||
// CHECK-SCUDO-AARCH64: "-pie"
|
||||
// CHECK-SCUDO-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.scudo.so"
|
||||
// CHECK-SCUDO-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.scudo.so"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
// RUN: -fsanitize=scudo -fPIC -shared 2>&1 \
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-SCUDO-SHARED
|
||||
// CHECK-SCUDO-SHARED: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-SCUDO-SHARED: "-fsanitize=safe-stack,scudo"
|
||||
// CHECK-SCUDO-SHARED: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.scudo.so"
|
||||
// CHECK-SCUDO-SHARED: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.scudo.so"
|
||||
|
||||
// RUN: %clang %s -### --target=x86_64-fuchsia \
|
||||
// RUN: -fxray-instrument -fxray-modes=xray-basic \
|
||||
|
|
@ -173,8 +173,8 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-XRAY-X86
|
||||
// CHECK-XRAY-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-XRAY-X86: "-fxray-instrument"
|
||||
// CHECK-XRAY-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.xray.a"
|
||||
// CHECK-XRAY-X86: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.xray-basic.a"
|
||||
// CHECK-XRAY-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.xray.a"
|
||||
// CHECK-XRAY-X86: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.xray-basic.a"
|
||||
|
||||
// RUN: %clang %s -### --target=aarch64-fuchsia \
|
||||
// RUN: -fxray-instrument -fxray-modes=xray-basic \
|
||||
|
|
@ -183,8 +183,8 @@
|
|||
// RUN: | FileCheck %s -check-prefix=CHECK-XRAY-AARCH64
|
||||
// CHECK-XRAY-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
|
||||
// CHECK-XRAY-AARCH64: "-fxray-instrument"
|
||||
// CHECK-XRAY-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.xray.a"
|
||||
// CHECK-XRAY-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.xray-basic.a"
|
||||
// CHECK-XRAY-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.xray.a"
|
||||
// CHECK-XRAY-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-fuchsia{{/|\\\\}}libclang_rt.xray-basic.a"
|
||||
|
||||
// RUN: %clang %s -### --target=aarch64-fuchsia \
|
||||
// RUN: -O3 -flto -mcpu=cortex-a53 2>&1 \
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
// CHECK: "-lc++"
|
||||
// CHECK: "-lm"
|
||||
// CHECK: "--pop-state"
|
||||
// CHECK: "[[RESOURCE_DIR]]{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}lib{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
|
||||
// CHECK: "-lc"
|
||||
// CHECK-NOT: crtend.o
|
||||
// CHECK-NOT: crtn.o
|
||||
|
|
|
|||
|
|
@ -18,10 +18,10 @@
|
|||
// RUN: --target=x86_64-linux-gnu \
|
||||
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
|
||||
// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-X8664 %s
|
||||
// CHECK-CLANGRT-X8664: x86_64-linux-gnu{{/|\\}}lib{{/|\\}}libclang_rt.builtins.a
|
||||
// CHECK-CLANGRT-X8664: lib{{/|\\}}x86_64-linux-gnu{{/|\\}}libclang_rt.builtins.a
|
||||
|
||||
// RUN: %clang -rtlib=compiler-rt -print-file-name=libclang_rt.builtins.a 2>&1 \
|
||||
// RUN: --target=x86_64-linux-gnu \
|
||||
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
|
||||
// RUN: | FileCheck --check-prefix=CHECK-FILE-NAME-X8664 %s
|
||||
// CHECK-FILE-NAME-X8664: x86_64-linux-gnu{{/|\\}}lib{{/|\\}}libclang_rt.builtins.a
|
||||
// CHECK-FILE-NAME-X8664: lib{{/|\\}}x86_64-linux-gnu{{/|\\}}libclang_rt.builtins.a
|
||||
|
|
|
|||
|
|
@ -365,7 +365,7 @@ endfunction()
|
|||
function(get_compiler_rt_install_dir arch install_dir)
|
||||
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
get_compiler_rt_target(${arch} target)
|
||||
set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/${target}/lib PARENT_SCOPE)
|
||||
set(${install_dir} ${COMPILER_RT_INSTALL_PATH}/lib/${target} PARENT_SCOPE)
|
||||
else()
|
||||
set(${install_dir} ${COMPILER_RT_LIBRARY_INSTALL_DIR} PARENT_SCOPE)
|
||||
endif()
|
||||
|
|
@ -374,7 +374,7 @@ endfunction()
|
|||
function(get_compiler_rt_output_dir arch output_dir)
|
||||
if(LLVM_ENABLE_PER_TARGET_RUNTIME_DIR AND NOT APPLE)
|
||||
get_compiler_rt_target(${arch} target)
|
||||
set(${output_dir} ${COMPILER_RT_OUTPUT_DIR}/${target}/lib PARENT_SCOPE)
|
||||
set(${output_dir} ${COMPILER_RT_OUTPUT_DIR}/lib/${target} PARENT_SCOPE)
|
||||
else()
|
||||
set(${output_dir} ${COMPILER_RT_LIBRARY_OUTPUT_DIR} PARENT_SCOPE)
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Reference in New Issue