Skip to content

Commit 5807d0e

Browse files
vitalybukavitalybuka
committed
[Drive] Don't match libclang_rt.builtins
Fixes fuchsia bots.
1 parent 814902a commit 5807d0e

File tree

1 file changed

+3
-34
lines changed

1 file changed

+3
-34
lines changed

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

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// Test sanitizers ld flags.
22

3-
// DEFINE: %{filecheck} = FileCheck %s --implicit-check-not="libclang_rt"
3+
// Match all libclang_rt, excluding platform-inconsistent builtins.
4+
5+
// DEFINE: %{filecheck} = FileCheck %s --implicit-check-not="libclang_rt.{{([^b]..|.[^u].|..[^i]).*}}"
46

57
// RUN: %clang -### %s 2>&1 \
68
// RUN: --target=i386-unknown-linux -fuse-ld=ld -fsanitize=address \
@@ -250,8 +252,6 @@
250252
// CHECK-ASAN-ANDROID-NOT: "-lresolv"
251253
// CHECK-ASAN-ANDROID: libclang_rt.asan.so"
252254
// CHECK-ASAN-ANDROID: libclang_rt.asan_static.a"
253-
// CHECK-ASAN-ANDROID: libclang_rt.builtins.a
254-
// CHECK-ASAN-ANDROID: libclang_rt.builtins.a
255255
// CHECK-ASAN-ANDROID-NOT: "-lpthread"
256256
// CHECK-ASAN-ANDROID-NOT: "-lresolv"
257257

@@ -272,8 +272,6 @@
272272
// CHECK-ASAN-ANDROID-STATICLIBASAN: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
273273
// CHECK-ASAN-ANDROID-STATICLIBASAN: libclang_rt.asan_static.a"
274274
// CHECK-ASAN-ANDROID-STATICLIBASAN: libclang_rt.asan.a"
275-
// CHECK-ASAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
276-
// CHECK-ASAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
277275
// CHECK-ASAN-ANDROID-STATICLIBASAN-NOT: "-lpthread"
278276
// CHECK-ASAN-ANDROID-STATICLIBASAN-NOT: "-lrt"
279277
// CHECK-ASAN-ANDROID-STATICLIBASAN-NOT: "-lresolv"
@@ -290,8 +288,6 @@
290288
// CHECK-UBSAN-ANDROID-NOT: "-lpthread"
291289
// CHECK-UBSAN-ANDROID-NOT: "-lresolv"
292290
// CHECK-UBSAN-ANDROID: libclang_rt.ubsan_standalone.so"
293-
// CHECK-UBSAN-ANDROID: libclang_rt.builtins.a"
294-
// CHECK-UBSAN-ANDROID: libclang_rt.builtins.a"
295291
// CHECK-UBSAN-ANDROID-NOT: "-lpthread"
296292
// CHECK-UBSAN-ANDROID-NOT: "-lresolv"
297293

@@ -304,8 +300,6 @@
304300
//
305301
// CHECK-UBSAN-ANDROID-STATICLIBASAN: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
306302
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.ubsan_standalone.a"
307-
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
308-
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
309303
// CHECK-UBSAN-ANDROID-STATICLIBASAN-NOT: "-lpthread"
310304
// CHECK-UBSAN-ANDROID-STATICLIBASAN-NOT: "-lrt"
311305
// CHECK-UBSAN-ANDROID-STATICLIBASAN-NOT: "-lresolv"
@@ -324,8 +318,6 @@
324318
// CHECK-ASAN-ANDROID-X86-NOT: "-lresolv"
325319
// CHECK-ASAN-ANDROID-X86: libclang_rt.asan.so"
326320
// CHECK-ASAN-ANDROID-X86: libclang_rt.asan_static.a"
327-
// CHECK-ASAN-ANDROID-X86: libclang_rt.builtins.a"
328-
// CHECK-ASAN-ANDROID-X86: libclang_rt.builtins.a"
329321
// CHECK-ASAN-ANDROID-X86-NOT: "-lpthread"
330322
// CHECK-ASAN-ANDROID-X86-NOT: "-lresolv"
331323
//
@@ -338,8 +330,6 @@
338330
// CHECK-ASAN-ANDROID-SHARED-LIBASAN-NOT: argument unused during compilation: '-shared-libsan'
339331
// CHECK-ASAN-ANDROID-SHARED-LIBASAN: libclang_rt.asan.so"
340332
// CHECK-ASAN-ANDROID-SHARED-LIBASAN: libclang_rt.asan_static.a"
341-
// CHECK-ASAN-ANDROID-SHARED-LIBASAN: libclang_rt.builtins.a"
342-
// CHECK-ASAN-ANDROID-SHARED-LIBASAN: libclang_rt.builtins.a"
343333
//
344334
// RUN: %clang -### %s 2>&1 \
345335
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=address \
@@ -352,8 +342,6 @@
352342
// CHECK-ASAN-ANDROID-SHARED-NOT: "-lc"
353343
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.asan.so"
354344
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.asan_static.a"
355-
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.builtins.a"
356-
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.builtins.a"
357345
// CHECK-ASAN-ANDROID-SHARED-NOT: "-lpthread"
358346
// CHECK-ASAN-ANDROID-SHARED-NOT: "-lresolv"
359347

@@ -829,8 +817,6 @@
829817
// RUN: --sysroot=%S/Inputs/basic_android_tree \
830818
// RUN: | %{filecheck} --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID
831819
// CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}"
832-
// CHECK-CFI-CROSS-DSO-ANDROID: libclang_rt.builtins.a
833-
// CHECK-CFI-CROSS-DSO-ANDROID: libclang_rt.builtins.a
834820

835821
// Cross-DSO CFI with diagnostics on Android links just the UBSAN runtime.
836822
// RUN: not %clang -fsanitize=cfi -fsanitize-cfi-cross-dso -### %s 2>&1 \
@@ -842,8 +828,6 @@
842828
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "{{.*}}ld{{(.exe)?}}"
843829
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "{{[^"]*}}libclang_rt.ubsan_standalone.so"
844830
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "--export-dynamic-symbol=__cfi_check"
845-
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: libclang_rt.builtins.a
846-
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: libclang_rt.builtins.a
847831

848832
// RUN: %clangxx -fsanitize=address -### %s 2>&1 \
849833
// RUN: -mmacos-version-min=10.6 \
@@ -898,7 +882,6 @@
898882
// RUN: | %{filecheck} --check-prefix=CHECK-SHADOWCALLSTACK-ELF-RISCV32
899883
// CHECK-SHADOWCALLSTACK-ELF-RISCV32-NOT: error:
900884
// CHECK-SHADOWCALLSTACK-ELF-RISCV32: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
901-
// CHECK-SHADOWCALLSTACK-ELF-RISCV32: libclang_rt.builtins.a
902885

903886
// RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
904887
// RUN: --target=riscv64-unknown-linux -fuse-ld=ld \
@@ -910,15 +893,12 @@
910893
// RUN: | %{filecheck} --check-prefix=CHECK-SHADOWCALLSTACK-ANDROID-RISCV64
911894
// CHECK-SHADOWCALLSTACK-ANDROID-RISCV64-NOT: error:
912895
// CHECK-SHADOWCALLSTACK-ANDROID-RISCV64: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
913-
// CHECK-SHADOWCALLSTACK-ANDROID-RISCV64: libclang_rt.builtins.a
914-
// CHECK-SHADOWCALLSTACK-ANDROID-RISCV64: libclang_rt.builtins.a
915896

916897
// RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
917898
// RUN: --target=riscv64-unknown-fuchsia -fuse-ld=ld \
918899
// RUN: | %{filecheck} --check-prefix=CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64
919900
// CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64-NOT: error:
920901
// CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
921-
// CHECK-SHADOWCALLSTACK-FUCHSIA-RISCV64: libclang_rt.builtins.a
922902

923903
// RUN: %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
924904
// RUN: --target=aarch64-unknown-linux -fuse-ld=ld -ffixed-x18 \
@@ -934,8 +914,6 @@
934914
// RUN: | %{filecheck} --check-prefix=CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-ANDROID
935915
// CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-ANDROID-NOT: error:
936916
// CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-ANDROID: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
937-
// CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-ANDROID: libclang_rt.builtins.a
938-
// CHECK-SHADOWCALLSTACK-LINUX-AARCH64-X18-ANDROID: libclang_rt.builtins.a
939917

940918
// RUN: not %clang -fsanitize=shadow-call-stack -### %s 2>&1 \
941919
// RUN: --target=x86-unknown-linux -fuse-ld=ld \
@@ -1003,26 +981,20 @@
1003981
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-ANDROID-ARM
1004982
//
1005983
// CHECK-SAFESTACK-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
1006-
// CHECK-SAFESTACK-ANDROID-ARM: libclang_rt.builtins.a
1007-
// CHECK-SAFESTACK-ANDROID-ARM: libclang_rt.builtins.a
1008984

1009985
// RUN: %clang -### %s -shared 2>&1 \
1010986
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=safe-stack \
1011987
// RUN: --sysroot=%S/Inputs/basic_android_tree \
1012988
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-SHARED-ANDROID-ARM
1013989
//
1014990
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
1015-
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: libclang_rt.builtins.a
1016-
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: libclang_rt.builtins.a
1017991

1018992
// RUN: %clang -### %s 2>&1 \
1019993
// RUN: --target=aarch64-linux-android -fuse-ld=ld -fsanitize=safe-stack \
1020994
// RUN: --sysroot=%S/Inputs/basic_android_tree \
1021995
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-ANDROID-AARCH64
1022996
//
1023997
// CHECK-SAFESTACK-ANDROID-AARCH64: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
1024-
// CHECK-SAFESTACK-ANDROID-AARCH64: libclang_rt.builtins.a
1025-
// CHECK-SAFESTACK-ANDROID-AARCH64: libclang_rt.builtins.a
1026998

1027999
// RUN: not %clang -fsanitize=undefined -### %s 2>&1 \
10281000
// RUN: --target=x86_64-scei-ps4 -fuse-ld=ld \
@@ -1131,8 +1103,6 @@
11311103
// CHECK-SCUDO-ANDROID: libclang_rt.scudo_standalone.so"
11321104
// CHECK-SCUDO-ANDROID-NOT: "-lpthread"
11331105
// CHECK-SCUDO-ANDROID-NOT: "-lresolv"
1134-
// CHECK-SCUDO-ANDROID: libclang_rt.builtins.a"
1135-
// CHECK-SCUDO-ANDROID: libclang_rt.builtins.a"
11361106

11371107
// RUN: %clang -### %s 2>&1 \
11381108
// RUN: --target=arm-linux-androideabi -fuse-ld=ld -fsanitize=scudo \
@@ -1146,7 +1116,6 @@
11461116
// CHECK-SCUDO-ANDROID-STATIC-NOT: "-lpthread"
11471117
// CHECK-SCUDO-ANDROID-STATIC-NOT: "-lrt"
11481118
// CHECK-SCUDO-ANDROID-STATIC-NOT: "-lresolv"
1149-
// CHECK-SCUDO-ANDROID-STATIC: "{{.*}}libclang_rt.builtins.a"
11501119

11511120
// RUN: %clang -### %s 2>&1 \
11521121
// RUN: --target=x86_64-unknown-linux -fuse-ld=ld -fsanitize=hwaddress \

0 commit comments

Comments
 (0)