Skip to content

Commit abae53f

Browse files
MaskRayMaskRay
committed
[Driver][test] Change some -fuse-ld=lld tests to be agnostic of host ld.lld
If program paths (GCC installation, --sysroot, -B, etc) don't contain ld.lld, whether -fuse-ld=lld succeeds depends on whether a PATH directory contains ld.lld. > error: invalid linker name in argument '-fuse-ld=lld' This behavior is not suitable when we adopt the new strict behavior of -### in D156363. For some tests, append -B%S/Inputs/lld similar to D92028. For others, use -fuse-ld=ld so that getDefaultLinker (instead of CLANG_DEFAULT_LINKER) is used. The complexity stems from CLANG_DEFAULT_LINKER.
1 parent 5c0f98c commit abae53f

14 files changed

+100
-106
lines changed

‎clang/test/Driver/Inputs/lld/ld.lld

Whitespace-only changes.

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
// RUN: %clang -### %s --target=csky 2>&1 | FileCheck -check-prefix=CC1 %s
55
// CC1: "-cc1" "-triple" "csky"
66

7-
// Test interaction with -fuse-ld=lld, if lld is available.
8-
// RUN: %clang -### %s --target=csky -fuse-ld=lld 2>&1 | FileCheck -check-prefix=LLD %s
9-
// LLD: {{(error: invalid linker name in argument '-fuse-ld=lld')|(ld.lld)}}
10-
117
// In the below tests, --rtlib=platform is used so that the driver ignores
128
// the configure-time CLANG_DEFAULT_RTLIB option when choosing the runtime lib
139

‎clang/test/Driver/fuchsia.c

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
22
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
3-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
3+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
44
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-X86_64 %s
55
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
66
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
7-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
7+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
88
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-AARCH64 %s
99
// RUN: %clang -### %s --target=riscv64-unknown-fuchsia \
1010
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
11-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
11+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
1212
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-RISCV64 %s
1313
// RUN: %clang -### %s --target=x86_64-fuchsia \
1414
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
15-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
15+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
1616
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-X86_64 %s
1717
// RUN: %clang -### %s --target=aarch64-fuchsia \
1818
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
19-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
19+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
2020
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-AARCH64 %s
2121
// RUN: %clang -### %s --target=riscv64-fuchsia \
2222
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
23-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
23+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
2424
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-RISCV64 %s
2525
// CHECK: "-cc1"
2626
// CHECK-X86_64: "-triple" "x86_64-unknown-fuchsia"
@@ -71,22 +71,22 @@
7171
// CHECK-FP-NONLEAF: "-mframe-pointer=non-leaf"
7272
// CHECK-FP-NONE: "-mframe-pointer=none"
7373

74-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -rtlib=libgcc -fuse-ld=lld 2>&1 \
74+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -rtlib=libgcc 2>&1 \
7575
// RUN: | FileCheck %s -check-prefix=CHECK-RTLIB
7676
// CHECK-RTLIB: error: invalid runtime library name in argument '-rtlib=libgcc'
7777

78-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -static -fuse-ld=lld 2>&1 \
78+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -static -fuse-ld=ld 2>&1 \
7979
// RUN: | FileCheck %s -check-prefix=CHECK-STATIC
8080
// CHECK-STATIC: "-Bstatic"
8181
// CHECK-STATIC: "-Bdynamic"
8282
// CHECK-STATIC: "-lc"
8383

84-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -shared -fuse-ld=lld 2>&1 \
84+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -shared -fuse-ld=ld 2>&1 \
8585
// RUN: | FileCheck %s -check-prefix=CHECK-SHARED
8686
// CHECK-SHARED-NOT: "-pie"
8787
// CHECK-SHARED: "-shared"
8888

89-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -r -fuse-ld=lld 2>&1 \
89+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -r -fuse-ld=ld 2>&1 \
9090
// RUN: | FileCheck %s -check-prefix=CHECK-RELOCATABLE
9191
// CHECK-RELOCATABLE-NOT: "-pie"
9292
// CHECK-RELOCATABLE-NOT: "--build-id"
@@ -95,21 +95,21 @@
9595
// CHECK-RELOCATABLE-NOT: "-l
9696
// CHECK-RELOCATABLE-NOT: crt{{[^./\\]+}}.o
9797

98-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nodefaultlibs -fuse-ld=lld 2>&1 \
98+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nodefaultlibs -fuse-ld=ld 2>&1 \
9999
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
100100
// RUN: | FileCheck %s -check-prefix=CHECK-NODEFAULTLIBS
101101
// CHECK-NODEFAULTLIBS: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
102102
// CHECK-NODEFAULTLIBS-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-unknown-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
103103
// CHECK-NODEFAULTLIBS-NOT: "-lc"
104104

105-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nostdlib -fuse-ld=lld 2>&1 \
105+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nostdlib -fuse-ld=ld 2>&1 \
106106
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
107107
// RUN: | FileCheck %s -check-prefix=CHECK-NOSTDLIB
108108
// CHECK-NOSTDLIB: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
109109
// CHECK-NOSTDLIB-NOT: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-unknown-fuchsia{{/|\\\\}}libclang_rt.builtins.a"
110110
// CHECK-NOSTDLIB-NOT: "-lc"
111111

112-
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nolibc -fuse-ld=lld 2>&1 \
112+
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia -nolibc -fuse-ld=ld 2>&1 \
113113
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
114114
// RUN: | FileCheck %s -check-prefix=CHECK-NOLIBC
115115
// CHECK-NOLIBC: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
@@ -119,7 +119,7 @@
119119
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
120120
// RUN: -fsanitize=safe-stack 2>&1 \
121121
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
122-
// RUN: -fuse-ld=lld \
122+
// RUN: -fuse-ld=ld \
123123
// RUN: | FileCheck %s -check-prefix=CHECK-SAFESTACK
124124
// CHECK-SAFESTACK: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
125125
// CHECK-SAFESTACK: "-fsanitize=safe-stack"
@@ -129,7 +129,7 @@
129129
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
130130
// RUN: -fsanitize=address 2>&1 \
131131
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
132-
// RUN: -fuse-ld=lld \
132+
// RUN: -fuse-ld=ld \
133133
// RUN: | FileCheck %s -check-prefix=CHECK-ASAN-X86
134134
// CHECK-ASAN-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
135135
// CHECK-ASAN-X86: "-fsanitize=address"
@@ -141,7 +141,7 @@
141141
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
142142
// RUN: -fsanitize=address 2>&1 \
143143
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
144-
// RUN: -fuse-ld=lld \
144+
// RUN: -fuse-ld=ld \
145145
// RUN: | FileCheck %s -check-prefix=CHECK-ASAN-AARCH64
146146
// CHECK-ASAN-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
147147
// CHECK-ASAN-AARCH64: "-fsanitize=address,shadow-call-stack"
@@ -153,7 +153,7 @@
153153
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
154154
// RUN: -fsanitize=address -fPIC -shared 2>&1 \
155155
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
156-
// RUN: -fuse-ld=lld \
156+
// RUN: -fuse-ld=ld \
157157
// RUN: | FileCheck %s -check-prefix=CHECK-ASAN-SHARED
158158
// CHECK-ASAN-SHARED: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
159159
// CHECK-ASAN-SHARED: "-fsanitize=address"
@@ -164,7 +164,7 @@
164164
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
165165
// RUN: -fsanitize=fuzzer 2>&1 \
166166
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
167-
// RUN: -fuse-ld=lld \
167+
// RUN: -fuse-ld=ld \
168168
// RUN: | FileCheck %s -check-prefix=CHECK-FUZZER-X86
169169
// CHECK-FUZZER-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
170170
// CHECK-FUZZER-X86: "-fsanitize=fuzzer,fuzzer-no-link,safe-stack"
@@ -173,7 +173,7 @@
173173
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
174174
// RUN: -fsanitize=fuzzer 2>&1 \
175175
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
176-
// RUN: -fuse-ld=lld \
176+
// RUN: -fuse-ld=ld \
177177
// RUN: | FileCheck %s -check-prefix=CHECK-FUZZER-AARCH64
178178
// CHECK-FUZZER-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
179179
// CHECK-FUZZER-AARCH64: "-fsanitize=fuzzer,fuzzer-no-link,shadow-call-stack"
@@ -182,7 +182,7 @@
182182
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
183183
// RUN: -fsanitize=scudo 2>&1 \
184184
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
185-
// RUN: -fuse-ld=lld \
185+
// RUN: -fuse-ld=ld \
186186
// RUN: | FileCheck %s -check-prefix=CHECK-SCUDO-X86
187187
// CHECK-SCUDO-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
188188
// CHECK-SCUDO-X86: "-fsanitize=safe-stack,scudo"
@@ -192,7 +192,7 @@
192192
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
193193
// RUN: -fsanitize=scudo 2>&1 \
194194
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
195-
// RUN: -fuse-ld=lld \
195+
// RUN: -fuse-ld=ld \
196196
// RUN: | FileCheck %s -check-prefix=CHECK-SCUDO-AARCH64
197197
// CHECK-SCUDO-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
198198
// CHECK-SCUDO-AARCH64: "-fsanitize=shadow-call-stack,scudo"
@@ -202,7 +202,7 @@
202202
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
203203
// RUN: -fsanitize=scudo -fPIC -shared 2>&1 \
204204
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
205-
// RUN: -fuse-ld=lld \
205+
// RUN: -fuse-ld=ld \
206206
// RUN: | FileCheck %s -check-prefix=CHECK-SCUDO-SHARED
207207
// CHECK-SCUDO-SHARED: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
208208
// CHECK-SCUDO-SHARED: "-fsanitize=safe-stack,scudo"
@@ -211,7 +211,7 @@
211211
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
212212
// RUN: -fsanitize=leak 2>&1 \
213213
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
214-
// RUN: -fuse-ld=lld \
214+
// RUN: -fuse-ld=ld \
215215
// RUN: | FileCheck %s -check-prefix=CHECK-LSAN-AARCH64
216216
// CHECK-LSAN-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
217217
// CHECK-LSAN-AARCH64: "-fsanitize=leak,shadow-call-stack"
@@ -221,7 +221,7 @@
221221
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
222222
// RUN: -fsanitize=leak 2>&1 \
223223
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
224-
// RUN: -fuse-ld=lld \
224+
// RUN: -fuse-ld=ld \
225225
// RUN: | FileCheck %s -check-prefix=CHECK-LSAN-X86
226226
// CHECK-LSAN-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
227227
// CHECK-LSAN-X86: "-fsanitize=leak,safe-stack"
@@ -231,7 +231,7 @@
231231
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
232232
// RUN: -fsanitize=leak -fPIC -shared 2>&1 \
233233
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
234-
// RUN: -fuse-ld=lld \
234+
// RUN: -fuse-ld=ld \
235235
// RUN: | FileCheck %s -check-prefix=CHECK-LSAN-SHARED
236236
// CHECK-LSAN-SHARED: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
237237
// CHECK-LSAN-SHARED: "-fsanitize=leak,shadow-call-stack"
@@ -240,7 +240,7 @@
240240
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
241241
// RUN: -fxray-instrument -fxray-modes=xray-basic \
242242
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
243-
// RUN: -fuse-ld=lld 2>&1 \
243+
// RUN: -fuse-ld=ld 2>&1 \
244244
// RUN: | FileCheck %s -check-prefix=CHECK-XRAY-X86
245245
// CHECK-XRAY-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
246246
// CHECK-XRAY-X86: "-fxray-instrument"
@@ -250,7 +250,7 @@
250250
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
251251
// RUN: -fxray-instrument -fxray-modes=xray-basic \
252252
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
253-
// RUN: -fuse-ld=lld 2>&1 \
253+
// RUN: -fuse-ld=ld 2>&1 \
254254
// RUN: | FileCheck %s -check-prefix=CHECK-XRAY-AARCH64
255255
// CHECK-XRAY-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
256256
// CHECK-XRAY-AARCH64: "-fxray-instrument"
@@ -259,14 +259,14 @@
259259

260260
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
261261
// RUN: -O3 -flto -mcpu=cortex-a53 2>&1 \
262-
// RUN: -fuse-ld=lld \
262+
// RUN: -fuse-ld=ld \
263263
// RUN: | FileCheck %s -check-prefix=CHECK-LTO
264264
// CHECK-LTO: "-plugin-opt=mcpu=cortex-a53"
265265
// CHECK-LTO: "-plugin-opt=O3"
266266

267267
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
268268
// RUN: -flto=thin -flto-jobs=8 2>&1 \
269-
// RUN: -fuse-ld=lld \
269+
// RUN: -fuse-ld=ld \
270270
// RUN: | FileCheck %s -check-prefix=CHECK-THINLTO
271271
// CHECK-THINLTO: "-plugin-opt=mcpu=x86-64"
272272
// CHECK-THINLTO: "-plugin-opt=thinlto"
@@ -280,15 +280,15 @@
280280
// RUN: %clang -### %s --target=aarch64-unknown-fuchsia \
281281
// RUN: -fprofile-instr-generate -fcoverage-mapping \
282282
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
283-
// RUN: -fuse-ld=lld 2>&1 \
283+
// RUN: -fuse-ld=ld 2>&1 \
284284
// RUN: | FileCheck %s -check-prefix=CHECK-PROFRT-AARCH64
285285
// CHECK-PROFRT-AARCH64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
286286
// CHECK-PROFRT-AARCH64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}aarch64-unknown-fuchsia{{/|\\\\}}libclang_rt.profile.a"
287287

288288
// RUN: %clang -### %s --target=x86_64-unknown-fuchsia \
289289
// RUN: -fprofile-instr-generate -fcoverage-mapping \
290290
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
291-
// RUN: -fuse-ld=lld 2>&1 \
291+
// RUN: -fuse-ld=ld 2>&1 \
292292
// RUN: | FileCheck %s -check-prefix=CHECK-PROFRT-X86_64
293293
// CHECK-PROFRT-X86_64: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
294294
// CHECK-PROFRT-X86_64: "[[RESOURCE_DIR]]{{/|\\\\}}lib{{/|\\\\}}x86_64-unknown-fuchsia{{/|\\\\}}libclang_rt.profile.a"

‎clang/test/Driver/fuchsia.cpp

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia \
22
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
33
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
4-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
4+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
55
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-X86_64 %s
66
// RUN: %clangxx -### %s --target=aarch64-unknown-fuchsia \
77
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
88
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
9-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
9+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
1010
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-AARCH64 %s
1111
// RUN: %clangxx -### %s --target=riscv64-unknown-fuchsia \
1212
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
1313
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
14-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
14+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
1515
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-RISCV64 %s
1616
// RUN: %clangxx -### %s --target=x86_64-fuchsia \
1717
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
1818
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
19-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
19+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
2020
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-X86_64 %s
2121
// RUN: %clangxx -### %s --target=aarch64-fuchsia \
2222
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
2323
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
24-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
24+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
2525
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-AARCH64 %s
2626
// RUN: %clangxx -### %s --target=riscv64-fuchsia \
2727
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
2828
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
29-
// RUN: --sysroot=%S/platform -fuse-ld=lld 2>&1 \
29+
// RUN: --sysroot=%S/platform -fuse-ld=ld 2>&1 \
3030
// RUN: | FileCheck -check-prefixes=CHECK,CHECK-RISCV64 %s
3131
// CHECK: "-cc1"
3232
// CHECK-X86_64: "-triple" "x86_64-unknown-fuchsia"
@@ -61,13 +61,12 @@
6161
// CHECK-NOT: crtend.o
6262
// CHECK-NOT: crtn.o
6363

64-
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -stdlib=libstdc++ \
65-
// RUN: -fuse-ld=lld 2>&1 \
64+
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -stdlib=libstdc++ 2>&1 \
6665
// RUN: | FileCheck %s -check-prefix=CHECK-STDLIB
6766
// CHECK-STDLIB: error: invalid library name in argument '-stdlib=libstdc++'
6867

6968
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -static-libstdc++ \
70-
// RUN: -fuse-ld=lld 2>&1 \
69+
// RUN: -fuse-ld=ld 2>&1 \
7170
// RUN: | FileCheck %s -check-prefix=CHECK-STATIC
7271
// CHECK-STATIC: "--push-state"
7372
// CHECK-STATIC: "--as-needed"
@@ -78,7 +77,7 @@
7877
// CHECK-STATIC: "--pop-state"
7978
// CHECK-STATIC: "-lc"
8079

81-
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -nostdlib++ -fuse-ld=lld 2>&1 \
80+
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -nostdlib++ -fuse-ld=ld 2>&1 \
8281
// RUN: | FileCheck %s -check-prefix=CHECK-NOSTDLIBXX
8382
// CHECK-NOSTDLIBXX-NOT: "-lc++"
8483
// CHECK-NOSTDLIBXX-NOT: "-lm"
@@ -87,49 +86,49 @@
8786
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia \
8887
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
8988
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
90-
// RUN: -fuse-ld=lld 2>&1\
89+
// RUN: -fuse-ld=ld 2>&1\
9190
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86
9291
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fsanitize=address \
9392
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
9493
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
95-
// RUN: -fuse-ld=lld 2>&1\
94+
// RUN: -fuse-ld=ld 2>&1\
9695
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-ASAN-X86
9796
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fno-exceptions \
9897
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
9998
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
100-
// RUN: -fuse-ld=lld 2>&1\
99+
// RUN: -fuse-ld=ld 2>&1\
101100
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-NOEXCEPT-X86
102101
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fsanitize=address -fno-exceptions \
103102
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
104103
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
105-
// RUN: -fuse-ld=lld 2>&1\
104+
// RUN: -fuse-ld=ld 2>&1\
106105
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-ASAN-NOEXCEPT-X86
107106
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fsanitize=hwaddress \
108107
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
109108
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
110-
// RUN: -fuse-ld=lld 2>&1\
109+
// RUN: -fuse-ld=ld 2>&1\
111110
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-HWASAN-X86
112111
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fsanitize=hwaddress -fno-exceptions \
113112
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
114113
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
115-
// RUN: -fuse-ld=lld 2>&1\
114+
// RUN: -fuse-ld=ld 2>&1\
116115
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-HWASAN-NOEXCEPT-X86
117116

118117
// Test compat multilibs.
119118
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fc++-abi=itanium \
120119
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
121120
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
122-
// RUN: -fuse-ld=lld 2>&1\
121+
// RUN: -fuse-ld=ld 2>&1\
123122
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-COMPAT-X86
124123
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fc++-abi=itanium -fc++-abi=fuchsia \
125124
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
126125
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
127-
// RUN: -fuse-ld=lld 2>&1\
126+
// RUN: -fuse-ld=ld 2>&1\
128127
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86
129128
// RUN: %clangxx -### %s --target=x86_64-unknown-fuchsia -fc++-abi=fuchsia -fc++-abi=itanium \
130129
// RUN: -ccc-install-dir %S/Inputs/basic_fuchsia_tree/bin \
131130
// RUN: -resource-dir=%S/Inputs/resource_dir_with_per_target_subdir \
132-
// RUN: -fuse-ld=lld 2>&1\
131+
// RUN: -fuse-ld=ld 2>&1\
133132
// RUN: | FileCheck %s -check-prefixes=CHECK-MULTILIB-X86,CHECK-MULTILIB-COMPAT-X86
134133
// CHECK-MULTILIB-X86: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
135134
// CHECK-MULTILIB-ASAN-X86: "-L{{.*}}{{/|\\\\}}..{{/|\\\\}}lib{{/|\\\\}}x86_64-unknown-fuchsia{{/|\\\\}}asan"

0 commit comments

Comments
 (0)