Skip to content

Commit 6a0b933

Browse files
pogo59pogo59
committed
Base the decision on the CMake variable instead
1 parent 8bac3e2 commit 6a0b933

18 files changed

+270
-211
lines changed

‎clang/lib/Driver/ToolChain.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,7 @@ std::string ToolChain::getCompilerRT(const ArgList &Args, StringRef Component,
685685
Path = P;
686686
}
687687
// Some targets default to the old layout.
688-
if (getTriple().isOSAIX() || getTriple().isPS() ||
689-
getTriple().isWindowsMSVCEnvironment())
688+
if (getTriple().isOSAIX() || !LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
690689
Path.clear();
691690

692691
// Check the filename for the old layout if the new one does not exist.

‎clang/test/Driver/arm-compiler-rt.c

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,63 @@
1+
// DEFINE: %{arch} = arm
2+
// DEFINE: %{suffix} = -DSUFFIX=%if !per_target_runtime_dir %{-%{arch}%}
3+
14
// RUN: %clang -target arm-none-eabi \
25
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
36
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
47
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
5-
// RUN: | FileCheck %s -check-prefix ARM-EABI
6-
// ARM-EABI: "{{[^"]*}}libclang_rt.builtins.a"
8+
// RUN: | FileCheck %s -check-prefix ARM-EABI %{suffix}
9+
// ARM-EABI: "{{[^"]*}}libclang_rt.builtins[[SUFFIX]].a"
710

811
// RUN: %clang -target arm-linux-gnueabi \
912
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
1013
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
1114
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
12-
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI
13-
// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins.a"
15+
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI %{suffix}
16+
// ARM-GNUEABI: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
1417

18+
// REDEFINE: %{arch} = armhf
1519
// RUN: %clang -target arm-linux-gnueabi \
1620
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
1721
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
1822
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
19-
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI
20-
// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
23+
// RUN: | FileCheck %s -check-prefix ARM-GNUEABI-ABI %{suffix}
24+
// ARM-GNUEABI-ABI: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
2125

2226
// RUN: %clang -target arm-linux-gnueabihf \
2327
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
2428
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
2529
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
26-
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF
27-
// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins.a"
30+
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF %{suffix}
31+
// ARM-GNUEABIHF: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
2832

33+
// REDEFINE: %{arch} = arm
2934
// RUN: %clang -target arm-linux-gnueabihf \
3035
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
3136
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
3237
// RUN: -rtlib=compiler-rt -mfloat-abi=soft -### %s 2>&1 \
33-
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF-ABI
34-
// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins.a"
38+
// RUN: | FileCheck %s -check-prefix ARM-GNUEABIHF-ABI %{suffix}
39+
// ARM-GNUEABIHF-ABI: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
3540

3641
// RUN: %clang -target arm-windows-itanium \
3742
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
3843
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
3944
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
40-
// RUN: | FileCheck %s -check-prefix ARM-WINDOWS
41-
// ARM-WINDOWS: "{{.*[/\\]}}clang_rt.builtins.lib"
45+
// RUN: | FileCheck %s -check-prefix ARM-WINDOWS %{suffix}
46+
// ARM-WINDOWS: "{{.*[/\\]}}clang_rt.builtins[[SUFFIX]].lib"
4247

48+
// REDEFINE: %{arch} = arm-android
4349
// RUN: %clang -target arm-linux-androideabi \
4450
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
4551
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
4652
// RUN: -rtlib=compiler-rt -### %s 2>&1 \
47-
// RUN: | FileCheck %s -check-prefix ARM-ANDROID
48-
// ARM-ANDROID: "{{.*[/\\]}}libclang_rt.builtins.a"
53+
// RUN: | FileCheck %s -check-prefix ARM-ANDROID %{suffix}
54+
// ARM-ANDROID: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
4955

56+
// REDEFINE: %{arch} = armhf-android
5057
// RUN: not %clang --target=arm-linux-androideabi \
5158
// RUN: --sysroot=%S/Inputs/resource_dir_with_arch_subdir \
5259
// RUN: -resource-dir=%S/Inputs/resource_dir_with_arch_subdir \
5360
// RUN: -rtlib=compiler-rt -mfloat-abi=hard -### %s 2>&1 \
54-
// RUN: | FileCheck %s -check-prefix ARM-ANDROIDHF
55-
// ARM-ANDROIDHF: "{{.*[/\\]}}libclang_rt.builtins.a"
61+
// RUN: | FileCheck %s -check-prefix ARM-ANDROIDHF %{suffix}
62+
// ARM-ANDROIDHF: "{{.*[/\\]}}libclang_rt.builtins[[SUFFIX]].a"
5663

‎clang/test/Driver/cl-link.c

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,41 @@
99
// LINK: "bar"
1010
// LINK: "baz"
1111

12-
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN %s
12+
// DEFINE: %{arch} = i386
13+
// DEFINE: %{suffix} = -DSUFFIX=%if !per_target_runtime_dir %{-%{arch}%}
14+
15+
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN %s %{suffix}
1316
// ASAN: link.exe
1417
// ASAN: "-debug"
1518
// ASAN: "-incremental:no"
16-
// ASAN: "{{[^"]*}}clang_rt.asan-i386.lib"
17-
// ASAN: "-wholearchive:{{.*}}clang_rt.asan-i386.lib"
18-
// ASAN: "{{[^"]*}}clang_rt.asan_cxx-i386.lib"
19-
// ASAN: "-wholearchive:{{.*}}clang_rt.asan_cxx-i386.lib"
19+
// ASAN: "{{[^"]*}}clang_rt.asan[[SUFFIX]].lib"
20+
// ASAN: "-wholearchive:{{.*}}clang_rt.asan[[SUFFIX]].lib"
21+
// ASAN: "{{[^"]*}}clang_rt.asan_cxx[[SUFFIX]].lib"
22+
// ASAN: "-wholearchive:{{.*}}clang_rt.asan_cxx[[SUFFIX]].lib"
2023
// ASAN: "{{.*}}cl-link{{.*}}.obj"
2124

22-
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /MD /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-MD %s
25+
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /MD /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-MD %s %{suffix}
2326
// ASAN-MD: link.exe
2427
// ASAN-MD: "-debug"
2528
// ASAN-MD: "-incremental:no"
26-
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic-i386.lib"
27-
// ASAN-MD: "{{[^"]*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib"
29+
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic[[SUFFIX]].lib"
30+
// ASAN-MD: "{{[^"]*}}clang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].lib"
2831
// ASAN-MD: "-include:___asan_seh_interceptor"
29-
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib"
32+
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].lib"
3033
// ASAN-MD: "{{.*}}cl-link{{.*}}.obj"
3134

3235
// RUN: %clang_cl /LD -fuse-ld=link -### /Tc%s 2>&1 | FileCheck --check-prefix=DLL %s
3336
// RUN: %clang_cl /LDd -fuse-ld=link -### /Tc%s 2>&1 | FileCheck --check-prefix=DLL %s
3437
// DLL: link.exe
3538
// "-dll"
3639

37-
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /LD /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-DLL %s
38-
// RUN: not %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /LDd /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-DLL %s
40+
// RUN: %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /LD /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-DLL %s %{suffix}
41+
// RUN: not %clang_cl -m32 -arch:IA32 --target=i386-pc-win32 /LDd /Tc%s -fuse-ld=link -### -fsanitize=address 2>&1 | FileCheck --check-prefix=ASAN-DLL %s %{suffix}
3942
// ASAN-DLL: link.exe
4043
// ASAN-DLL: "-dll"
4144
// ASAN-DLL: "-debug"
4245
// ASAN-DLL: "-incremental:no"
43-
// ASAN-DLL: "{{.*}}clang_rt.asan_dll_thunk-i386.lib"
46+
// ASAN-DLL: "{{.*}}clang_rt.asan_dll_thunk[[SUFFIX]].lib"
4447
// ASAN-DLL: "{{.*}}cl-link{{.*}}.obj"
4548

4649
// RUN: %clang_cl /Zi /Tc%s -fuse-ld=link -### 2>&1 | FileCheck --check-prefix=DEBUG %s

‎clang/test/Driver/compiler-rt-unwind.c

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
// General tests that the driver handles combinations of --rtlib=XXX and
22
// --unwindlib=XXX properly.
33
//
4+
// DEFINE: %{arch} = x86_64
5+
// DEFINE: %{suffix} = -DSUFFIX=%if !per_target_runtime_dir %{-%{arch}%}
6+
//
47
// RUN: %clang -### %s 2>&1 \
58
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=platform \
69
// RUN: -resource-dir=%S/Inputs/resource_dir \
@@ -51,34 +54,34 @@
5154
// RUN: %clang -### %s 2>&1 \
5255
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \
5356
// RUN: -resource-dir=%S/Inputs/resource_dir \
54-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s
55-
// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
57+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s %{suffix}
58+
// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
5659
//
5760
// RUN: %clang -### %s 2>&1 \
5861
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
5962
// RUN: -resource-dir=%S/Inputs/resource_dir \
60-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
63+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
6164
// RUN: %clangxx -### %s 2>&1 \
6265
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
6366
// RUN: -resource-dir=%S/Inputs/resource_dir \
64-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
65-
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
67+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
68+
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
6669
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "--as-needed"
6770
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "-lunwind"
6871
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "--no-as-needed"
6972
//
7073
// RUN: %clang -### %s 2>&1 \
7174
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
7275
// RUN: -resource-dir=%S/Inputs/resource_dir \
73-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s
74-
// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins.a"
76+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s %{suffix}
77+
// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
7578
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-SAME: "-lgcc_s"
7679
//
7780
// RUN: %clang -### %s 2>&1 \
7881
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
7982
// RUN: -static -resource-dir=%S/Inputs/resource_dir \
80-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s
81-
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins.a"
83+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s %{suffix}
84+
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
8285
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC-SAME: "-lgcc_eh"
8386
//
8487
// RUN: not %clang %s 2> %t.err \
@@ -97,22 +100,22 @@
97100
// RUN: %clang -### %s 2>&1 \
98101
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
99102
// RUN: -shared-libgcc \
100-
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT %s
101-
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
103+
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT %s %{suffix}
104+
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
102105
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.dll.a"
103106
//
104107
// RUN: %clang -### %s 2>&1 \
105108
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
106109
// RUN: -static-libgcc \
107-
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT %s
108-
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
110+
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT %s %{suffix}
111+
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
109112
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.a"
110113
//
111114
// RUN: %clang -### %s 2>&1 \
112115
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
113-
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
116+
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
114117
// RUN: %clangxx -### %s 2>&1 \
115118
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
116-
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
117-
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
119+
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
120+
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
118121
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "-lunwind"

‎clang/test/Driver/coverage-ld.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Test coverage ld flags.
2-
//
2+
// REQUIRES: per_target_runtime_dir
3+
//
34
// RUN: %clang -### %s 2>&1 \
45
// RUN: --target=i386-unknown-linux -fprofile-arcs \
56
// RUN: -resource-dir=%S/Inputs/resource_dir \

‎clang/test/Driver/fuchsia.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// REQUIRES: per_target_runtime_dir
12
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
23
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
34
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \

‎clang/test/Driver/instrprof-ld.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// Test instrumented profiling ld flags.
2+
// REQUIRES: per_target_runtime_dir
23
//
34
// RUN: %clang -### %s 2>&1 \
45
// RUN: --target=i386-unknown-linux -fprofile-instr-generate -fuse-ld=ld \

‎clang/test/Driver/lit.local.cfg

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@ if llvm_config.use_lld(required=False):
4949

5050
if config.ppc_linux_default_ieeelongdouble:
5151
config.available_features.add("ppc_linux_default_ieeelongdouble")
52+
53+
if config.per_target_runtime_dir:
54+
config.available_features.add("per_target_runtime_dir")
55+
config.recursiveExpansionLimit = 2

‎clang/test/Driver/mingw-sanitizers.c

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1+
// DEFINE: %{arch} = i386
2+
// DEFINE: %{suffix} = -DSUFFIX=%if !per_target_runtime_dir %{-%{arch}%}
3+
//
14
// RUN: touch %t.a
2-
// RUN: %clang -target i686-windows-gnu %s -### -fsanitize=address -lcomponent %/t.a 2>&1 | FileCheck --check-prefixes=ASAN-ALL,ASAN-I686 -DINPUT=%/t.a %s
3-
// RUN: %clang -target x86_64-windows-gnu %s -### -fsanitize=address -lcomponent %/t.a 2>&1 | FileCheck --check-prefixes=ASAN-ALL,ASAN-X86_64 -DINPUT=%/t.a %s
5+
// RUN: %clang -target i686-windows-gnu %s -### -fsanitize=address -lcomponent %/t.a 2>&1 | FileCheck --check-prefixes=ASAN-ALL,ASAN-I686 -DINPUT=%/t.a %s %{suffix}
6+
// REDEFINE: %{arch} = x86_64
7+
// RUN: %clang -target x86_64-windows-gnu %s -### -fsanitize=address -lcomponent %/t.a 2>&1 | FileCheck --check-prefixes=ASAN-ALL,ASAN-X86_64 -DINPUT=%/t.a %s %{suffix}
48
//
59
// ASAN-ALL-NOT:"-l{{[^"]+"]}}"
610
// ASAN-ALL-NOT:"[[INPUT]]"
7-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
8-
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
11+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
12+
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
913
// ASAN-ALL: "-lcomponent"
1014
// ASAN-ALL: "[[INPUT]]"
11-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
12-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a"
15+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
16+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a"
1317
// ASAN-I686: "--require-defined" "___asan_seh_interceptor"
14-
// ASAN-I686: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a" "--no-whole-archive"
15-
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
16-
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a"
18+
// ASAN-I686: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a" "--no-whole-archive"
19+
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
20+
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a"
1721
// ASAN-X86_64: "--require-defined" "__asan_seh_interceptor"
18-
// ASAN-X86_64: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a" "--no-whole-archive"
22+
// ASAN-X86_64: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a" "--no-whole-archive"
1923

2024
// RUN: %clang -target x86_64-windows-gnu %s -### -fsanitize=vptr

‎clang/test/Driver/msp430-toolchain.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Splitting some tests into POS and NEG parts so the latter can validate
22
// output fragments as large as possible for absence of some text.
3+
// REQUIRES: per_target_runtime_dir
34

45
// Test for include paths and other cc1 flags
56

0 commit comments

Comments
 (0)