Skip to content

Commit e42895a

Browse files
pogo59pogo59
committed
Revert "Base the decision on the CMake variable instead"
This reverts commit 6a0b933.
1 parent 6a0b933 commit e42895a

18 files changed

+211
-270
lines changed

‎clang/lib/Driver/ToolChain.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,8 @@ 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() || !LLVM_ENABLE_PER_TARGET_RUNTIME_DIR)
688+
if (getTriple().isOSAIX() || getTriple().isPS() ||
689+
getTriple().isWindowsMSVCEnvironment())
689690
Path.clear();
690691

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

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

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

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

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

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

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

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

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

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

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

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

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}
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
1613
// ASAN: link.exe
1714
// ASAN: "-debug"
1815
// ASAN: "-incremental:no"
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"
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"
2320
// ASAN: "{{.*}}cl-link{{.*}}.obj"
2421

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}
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
2623
// ASAN-MD: link.exe
2724
// ASAN-MD: "-debug"
2825
// ASAN-MD: "-incremental:no"
29-
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic[[SUFFIX]].lib"
30-
// ASAN-MD: "{{[^"]*}}clang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].lib"
26+
// ASAN-MD: "{{.*}}clang_rt.asan_dynamic-i386.lib"
27+
// ASAN-MD: "{{[^"]*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib"
3128
// ASAN-MD: "-include:___asan_seh_interceptor"
32-
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].lib"
29+
// ASAN-MD: "-wholearchive:{{.*}}clang_rt.asan_dynamic_runtime_thunk-i386.lib"
3330
// ASAN-MD: "{{.*}}cl-link{{.*}}.obj"
3431

3532
// RUN: %clang_cl /LD -fuse-ld=link -### /Tc%s 2>&1 | FileCheck --check-prefix=DLL %s
3633
// RUN: %clang_cl /LDd -fuse-ld=link -### /Tc%s 2>&1 | FileCheck --check-prefix=DLL %s
3734
// DLL: link.exe
3835
// "-dll"
3936

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}
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
4239
// ASAN-DLL: link.exe
4340
// ASAN-DLL: "-dll"
4441
// ASAN-DLL: "-debug"
4542
// ASAN-DLL: "-incremental:no"
46-
// ASAN-DLL: "{{.*}}clang_rt.asan_dll_thunk[[SUFFIX]].lib"
43+
// ASAN-DLL: "{{.*}}clang_rt.asan_dll_thunk-i386.lib"
4744
// ASAN-DLL: "{{.*}}cl-link{{.*}}.obj"
4845

4946
// 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: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
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-
//
74
// RUN: %clang -### %s 2>&1 \
85
// RUN: --target=x86_64-unknown-linux -rtlib=libgcc --unwindlib=platform \
96
// RUN: -resource-dir=%S/Inputs/resource_dir \
@@ -54,34 +51,34 @@
5451
// RUN: %clang -### %s 2>&1 \
5552
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt \
5653
// RUN: -resource-dir=%S/Inputs/resource_dir \
57-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s %{suffix}
58-
// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
54+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT %s
55+
// RTLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
5956
//
6057
// RUN: %clang -### %s 2>&1 \
6158
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
6259
// RUN: -resource-dir=%S/Inputs/resource_dir \
63-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
60+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
6461
// RUN: %clangxx -### %s 2>&1 \
6562
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libunwind \
6663
// RUN: -resource-dir=%S/Inputs/resource_dir \
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"
64+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
65+
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT: "{{.*}}libclang_rt.builtins.a"
6966
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "--as-needed"
7067
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "-lunwind"
7168
// RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "--no-as-needed"
7269
//
7370
// RUN: %clang -### %s 2>&1 \
7471
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
7572
// RUN: -resource-dir=%S/Inputs/resource_dir \
76-
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s %{suffix}
77-
// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins[[SUFFIX]].a"
73+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC %s
74+
// RTLIB-COMPILER-RT-UNWINDLIB-GCC: "{{.*}}libclang_rt.builtins.a"
7875
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-SAME: "-lgcc_s"
7976
//
8077
// RUN: %clang -### %s 2>&1 \
8178
// RUN: --target=x86_64-unknown-linux -rtlib=compiler-rt --unwindlib=libgcc \
8279
// RUN: -static -resource-dir=%S/Inputs/resource_dir \
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"
80+
// RUN: | FileCheck --check-prefix=RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC %s
81+
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC: "{{.*}}libclang_rt.builtins.a"
8582
// RTLIB-COMPILER-RT-UNWINDLIB-GCC-STATIC-SAME: "-lgcc_eh"
8683
//
8784
// RUN: not %clang %s 2> %t.err \
@@ -100,22 +97,22 @@
10097
// RUN: %clang -### %s 2>&1 \
10198
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
10299
// RUN: -shared-libgcc \
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"
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"
105102
// MINGW-RTLIB-COMPILER-RT-SHARED-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.dll.a"
106103
//
107104
// RUN: %clang -### %s 2>&1 \
108105
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
109106
// RUN: -static-libgcc \
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"
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"
112109
// MINGW-RTLIB-COMPILER-RT-STATIC-UNWINDLIB-COMPILER-RT-SAME: "-l:libunwind.a"
113110
//
114111
// RUN: %clang -### %s 2>&1 \
115112
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
116-
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s %{suffix}
113+
// RUN: | FileCheck --check-prefix=MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT %s
117114
// RUN: %clangxx -### %s 2>&1 \
118115
// RUN: --target=x86_64-w64-mingw32 -rtlib=compiler-rt --unwindlib=libunwind \
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"
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"
121118
// MINGW-RTLIB-COMPILER-RT-UNWINDLIB-COMPILER-RT-SAME: "-lunwind"

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

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

‎clang/test/Driver/fuchsia.c

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

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

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,3 @@ 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: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
1-
// DEFINE: %{arch} = i386
2-
// DEFINE: %{suffix} = -DSUFFIX=%if !per_target_runtime_dir %{-%{arch}%}
3-
//
41
// RUN: touch %t.a
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}
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
84
//
95
// ASAN-ALL-NOT:"-l{{[^"]+"]}}"
106
// ASAN-ALL-NOT:"[[INPUT]]"
11-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
12-
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
7+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
8+
// ASAN-X86_64: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
139
// ASAN-ALL: "-lcomponent"
1410
// ASAN-ALL: "[[INPUT]]"
15-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic[[SUFFIX]].dll.a"
16-
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a"
11+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic.dll.a"
12+
// ASAN-I686: "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a"
1713
// ASAN-I686: "--require-defined" "___asan_seh_interceptor"
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"
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"
2117
// ASAN-X86_64: "--require-defined" "__asan_seh_interceptor"
22-
// ASAN-X86_64: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk[[SUFFIX]].a" "--no-whole-archive"
18+
// ASAN-X86_64: "--whole-archive" "{{[^"]*}}libclang_rt.asan_dynamic_runtime_thunk.a" "--no-whole-archive"
2319

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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
43

54
// Test for include paths and other cc1 flags
65

0 commit comments

Comments
 (0)