[clang] [clang][NFC] Test msvc multilib resource dirs (PR #238210)

Sam Elliott via cfe-commits cfe-commits at lists.llvm.org
Mon Nov 2 22:03:27 PST 2026


https://github.com/lenary updated https://github.com/llvm/llvm-project/pull/238210

>From f037c43d226da43df0f79c27a66159c08bb10bc4 Mon Sep 17 00:00:00 2001
From: Sam Elliott <aelliott at qti.qualcomm.com>
Date: Mon, 2 Nov 2026 20:27:57 -0800
Subject: [PATCH 1/2] [clang][NFC] Test msvc multilib resource dirs

As with other similar tests, explicitly add checks for the resource dir
paths added by the driver when using multilibs.
---
 .../multilib_msvc_tree/resource/include/.keep       |  0
 .../x86_64-pc-windows-msvc/clang_rt.builtins.lib    |  1 +
 .../debug/clang_rt.builtins.lib                     |  1 +
 .../noexcept/clang_rt.builtins.lib                  |  1 +
 clang/test/Driver/msvc-multilib.yaml                | 13 +++++++++++++
 5 files changed, 16 insertions(+)
 create mode 100644 clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep
 create mode 100644 clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
 create mode 100644 clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
 create mode 100644 clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib

diff --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/include/.keep
new file mode 100644
index 00000000000000..e69de29bb2d1d6
diff --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.
diff --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/debug/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.
diff --git a/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib
new file mode 100644
index 00000000000000..cc68999e800ec9
--- /dev/null
+++ b/clang/test/Driver/Inputs/multilib_msvc_tree/resource/lib/x86_64-pc-windows-msvc/noexcept/clang_rt.builtins.lib
@@ -0,0 +1 @@
+Fixture used to verify MSVC multilib compiler-rt lookup.
diff --git a/clang/test/Driver/msvc-multilib.yaml b/clang/test/Driver/msvc-multilib.yaml
index b650393003fd0e..e58bc7489784e5 100644
--- a/clang/test/Driver/msvc-multilib.yaml
+++ b/clang/test/Driver/msvc-multilib.yaml
@@ -2,15 +2,21 @@
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
 # RUN:     --target=x86_64-pc-windows-msvc -fmultilib-flag=debug \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-DEBUG %s
 # CHECK-DEBUG:      "-cc1" "-triple" "x86_64-pc-windows-msvc
+# CHECK-DEBUG:      "-resource-dir" "{{.*}}multilib_msvc_tree{{[/\\]}}resource"
+# CHECK-DEBUG-SAME: "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}include"
 # CHECK-DEBUG:      "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
+# CHECK-DEBUG:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug"
 # CHECK-DEBUG:      "-libpath:{{[^"]*}}/debug"
+# CHECK-DEBUG:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug{{[/\\]}}clang_rt.builtins.lib"
 
 # 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-pc-windows-msvc \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-DEFAULT %s
 # CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/debug"
 # CHECK-DEFAULT-NOT: "-libpath:{{[^"]*}}/release"
@@ -18,16 +24,23 @@
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/release"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/noexcept"
+# CHECK-DEFAULT:      "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}include"
+# CHECK-DEFAULT:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}clang_rt.builtins.lib"
 
 # Multiple matches stacking on top of each-other.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
 # RUN:     --target=x86_64-pc-windows-msvc -fmultilib-flag=debug -fno-exceptions \
 # RUN:     -ccc-install-dir %S/Inputs/multilib_msvc_tree/bin \
+# RUN:     -resource-dir=%S/Inputs/multilib_msvc_tree/resource \
 # RUN:   | FileCheck --check-prefix=CHECK-LAYERED %s
+# CHECK-LAYERED:      "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}include"
 # CHECK-LAYERED:      "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/noexcept"
 # CHECK-LAYERED-SAME: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
+# CHECK-LAYERED:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}noexcept"
+# CHECK-LAYERED-SAME: "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug"
 # CHECK-LAYERED:      "-libpath:{{[^"]*}}/noexcept"
 # CHECK-LAYERED-SAME: "-libpath:{{[^"]*}}/debug"
+# CHECK-LAYERED:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}noexcept{{[/\\]}}clang_rt.builtins.lib"
 
 # Lists selected variant directories.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -print-multi-directory 2>&1 \

>From 2b8efcd91b68ce119dfa42c687de26576337118a Mon Sep 17 00:00:00 2001
From: Sam Elliott <aelliott at qti.qualcomm.com>
Date: Mon, 2 Nov 2026 22:03:01 -0800
Subject: [PATCH 2/2] Remove clang_rt.builtins.a paths

They are not passed explicitly on windows, unlike mingw/linux.
---
 clang/test/Driver/msvc-multilib.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clang/test/Driver/msvc-multilib.yaml b/clang/test/Driver/msvc-multilib.yaml
index e58bc7489784e5..b5a8248798ce36 100644
--- a/clang/test/Driver/msvc-multilib.yaml
+++ b/clang/test/Driver/msvc-multilib.yaml
@@ -10,7 +10,6 @@
 # CHECK-DEBUG:      "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/debug"
 # CHECK-DEBUG:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug"
 # CHECK-DEBUG:      "-libpath:{{[^"]*}}/debug"
-# CHECK-DEBUG:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug{{[/\\]}}clang_rt.builtins.lib"
 
 # 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 \
@@ -25,7 +24,7 @@
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/release"
 # CHECK-DEFAULT-NOT: "-internal-isystem" "{{[^"]*}}{{[/\\]}}x86_64-pc-windows-msvc/noexcept"
 # CHECK-DEFAULT:      "-internal-isystem" "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}include"
-# CHECK-DEFAULT:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}clang_rt.builtins.lib"
+# CHECK-DEFAULT:      "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc"
 
 # Multiple matches stacking on top of each-other.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -x c %s -### -o /dev/null 2>&1 \
@@ -40,7 +39,6 @@
 # CHECK-LAYERED-SAME: "-libpath:{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}debug"
 # CHECK-LAYERED:      "-libpath:{{[^"]*}}/noexcept"
 # CHECK-LAYERED-SAME: "-libpath:{{[^"]*}}/debug"
-# CHECK-LAYERED:      "{{.*}}multilib_msvc_tree{{[/\\]}}resource{{[/\\]}}lib{{[/\\]}}x86_64-pc-windows-msvc{{[/\\]}}noexcept{{[/\\]}}clang_rt.builtins.lib"
 
 # Lists selected variant directories.
 # RUN: %clang --multi-lib-config=%s -no-canonical-prefixes -print-multi-directory 2>&1 \



More information about the cfe-commits mailing list