llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-clang Author: Sam Elliott (lenary) <details> <summary>Changes</summary> This is another follow-up to 78820cb91605693b7d768be4ebc8b66181d3e9c3 to show the behaviour of resource dir resolution after that change. Assisted-by: AI --- Full diff: https://github.com/llvm/llvm-project/pull/238147.diff 3 Files Affected: - (added) clang/test/Driver/Inputs/multilib_linux_tree/resource/include/.keep (+1) - (added) clang/test/Driver/Inputs/multilib_linux_tree/resource/lib/x86_64-unknown-linux-gnu/debug/libclang_rt.builtins.a (+1) - (modified) clang/test/Driver/linux-multilib.yaml (+13) ``````````diff diff --git a/clang/test/Driver/Inputs/multilib_linux_tree/resource/include/.keep b/clang/test/Driver/Inputs/multilib_linux_tree/resource/include/.keep new file mode 100644 index 00000000000000..8b137891791fe9 --- /dev/null +++ b/clang/test/Driver/Inputs/multilib_linux_tree/resource/include/.keep @@ -0,0 +1 @@ + diff --git a/clang/test/Driver/Inputs/multilib_linux_tree/resource/lib/x86_64-unknown-linux-gnu/debug/libclang_rt.builtins.a b/clang/test/Driver/Inputs/multilib_linux_tree/resource/lib/x86_64-unknown-linux-gnu/debug/libclang_rt.builtins.a new file mode 100644 index 00000000000000..8b137891791fe9 --- /dev/null +++ b/clang/test/Driver/Inputs/multilib_linux_tree/resource/lib/x86_64-unknown-linux-gnu/debug/libclang_rt.builtins.a @@ -0,0 +1 @@ + diff --git a/clang/test/Driver/linux-multilib.yaml b/clang/test/Driver/linux-multilib.yaml index 888a816214933a..95a9858cce94a7 100644 --- a/clang/test/Driver/linux-multilib.yaml +++ b/clang/test/Driver/linux-multilib.yaml @@ -1,12 +1,25 @@ # Basic selection where -fmultilib-flag=debug selects the debug variant. +# Linux keeps builtin headers in ResourceDir/include, while the selected YAML +# directory selects the target-specific include directory. # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \ # RUN: --target=x86_64-linux-gnu -fmultilib-flag=debug --sysroot= \ # RUN: -ccc-install-dir %S/Inputs/multilib_linux_tree/usr/bin \ +# RUN: -resource-dir=%S/Inputs/multilib_linux_tree/resource \ # RUN: | FileCheck --check-prefix=CHECK-DEBUG %s # CHECK-DEBUG: "-cc1" "-triple" "x86_64-unknown-linux-gnu" +# CHECK-DEBUG: "-internal-isystem" "{{.*}}/resource/include" # CHECK-DEBUG: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-unknown-linux-gnu/debug" # CHECK-DEBUG: "-L{{[^"]*}}/debug" +# The selected YAML directory is also appended to Clang's per-target runtime +# directory when resolving compiler-rt libraries. +# RUN: %clang --multi-lib-config=%s -print-libgcc-file-name \ +# RUN: --target=x86_64-linux-gnu -fmultilib-flag=debug \ +# RUN: -resource-dir=%S/Inputs/multilib_linux_tree/resource \ +# RUN: --rtlib=compiler-rt \ +# RUN: | FileCheck --check-prefix=CHECK-RESOURCE-LIB %s +# CHECK-RESOURCE-LIB: {{.*}}/resource/lib/x86_64-unknown-linux-gnu/debug/libclang_rt.builtins.a + # Default behavior where no variant path is prepended. # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \ # RUN: --target=x86_64-linux-gnu --sysroot= \ `````````` </details> https://github.com/llvm/llvm-project/pull/238147 _______________________________________________ cfe-commits mailing list [email protected] https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
