Skip to content

Commit bad5532

Browse files
vitalybukavitalybuka
committed
[𝘀𝗽𝗿] changes introduced through rebase
Created using spr 1.3.4 [skip ci]
2 parents 2955990 + 8e9fda1 commit bad5532

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

‎clang-tools-extra/clang-tidy/tool/ClangTidyMain.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ Configuration files:
6161
globs can be specified as a list instead of a
6262
string.
6363
ExcludeHeaderFilterRegex - Same as '--exclude-header-filter'.
64-
ExtraArgs - Same as '--extra-args'.
65-
ExtraArgsBefore - Same as '--extra-args-before'.
64+
ExtraArgs - Same as '--extra-arg'.
65+
ExtraArgsBefore - Same as '--extra-arg-before'.
6666
FormatStyle - Same as '--format-style'.
6767
HeaderFileExtensions - File extensions to consider to determine if a
6868
given diagnostic is located in a header file.
69-
HeaderFilterRegex - Same as '--header-filter-regex'.
69+
HeaderFilterRegex - Same as '--header-filter'.
7070
ImplementationFileExtensions - File extensions to consider to determine if a
7171
given diagnostic is located in an
7272
implementation file.

‎clang-tools-extra/docs/clang-tidy/index.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,8 +293,8 @@ An overview of all the command-line options:
293293
globs can be specified as a list instead of a
294294
string.
295295
ExcludeHeaderFilterRegex - Same as '--exclude-header-filter'.
296-
ExtraArgs - Same as '--extra-args'.
297-
ExtraArgsBefore - Same as '--extra-args-before'.
296+
ExtraArgs - Same as '--extra-arg'.
297+
ExtraArgsBefore - Same as '--extra-arg-before'.
298298
FormatStyle - Same as '--format-style'.
299299
HeaderFileExtensions - File extensions to consider to determine if a
300300
given diagnostic is located in a header file.

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@
243243
// RUN: -resource-dir=%S/Inputs/resource_dir \
244244
// RUN: | %{filecheck} --check-prefix=CHECK-ASAN-ANDROID
245245
//
246-
// CHECK-ASAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
246+
// CHECK-ASAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
247247
// CHECK-ASAN-ANDROID: "-pie"
248248
// CHECK-ASAN-ANDROID-NOT: "-lc"
249249
// CHECK-ASAN-ANDROID-NOT: "-lpthread"
@@ -269,7 +269,7 @@
269269
// RUN: -static-libasan \
270270
// RUN: | %{filecheck} --check-prefix=CHECK-ASAN-ANDROID-STATICLIBASAN
271271
//
272-
// CHECK-ASAN-ANDROID-STATICLIBASAN: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
272+
// 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"
275275
// CHECK-ASAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
@@ -284,7 +284,7 @@
284284
// RUN: -resource-dir=%S/Inputs/resource_dir \
285285
// RUN: | %{filecheck} --check-prefix=CHECK-UBSAN-ANDROID
286286
//
287-
// CHECK-UBSAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
287+
// CHECK-UBSAN-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
288288
// CHECK-UBSAN-ANDROID: "-pie"
289289
// CHECK-UBSAN-ANDROID-NOT: "-lc"
290290
// CHECK-UBSAN-ANDROID-NOT: "-lpthread"
@@ -302,7 +302,7 @@
302302
// RUN: -static-libsan \
303303
// RUN: | %{filecheck} --check-prefix=CHECK-UBSAN-ANDROID-STATICLIBASAN
304304
//
305-
// CHECK-UBSAN-ANDROID-STATICLIBASAN: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
305+
// CHECK-UBSAN-ANDROID-STATICLIBASAN: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
306306
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.ubsan_standalone.a"
307307
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
308308
// CHECK-UBSAN-ANDROID-STATICLIBASAN: libclang_rt.builtins.a"
@@ -317,7 +317,7 @@
317317
// RUN: -resource-dir=%S/Inputs/resource_dir \
318318
// RUN: | %{filecheck} --check-prefix=CHECK-ASAN-ANDROID-X86
319319
//
320-
// CHECK-ASAN-ANDROID-X86: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
320+
// CHECK-ASAN-ANDROID-X86: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
321321
// CHECK-ASAN-ANDROID-X86: "-pie"
322322
// CHECK-ASAN-ANDROID-X86-NOT: "-lc"
323323
// CHECK-ASAN-ANDROID-X86-NOT: "-lpthread"
@@ -348,7 +348,7 @@
348348
// RUN: -shared \
349349
// RUN: | %{filecheck} --check-prefix=CHECK-ASAN-ANDROID-SHARED
350350
//
351-
// CHECK-ASAN-ANDROID-SHARED: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
351+
// CHECK-ASAN-ANDROID-SHARED: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
352352
// CHECK-ASAN-ANDROID-SHARED-NOT: "-lc"
353353
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.asan.so"
354354
// CHECK-ASAN-ANDROID-SHARED: libclang_rt.asan_static.a"
@@ -828,7 +828,7 @@
828828
// RUN: -resource-dir=%S/Inputs/resource_dir \
829829
// RUN: --sysroot=%S/Inputs/basic_android_tree \
830830
// RUN: | %{filecheck} --check-prefix=CHECK-CFI-CROSS-DSO-ANDROID
831-
// CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld"
831+
// CHECK-CFI-CROSS-DSO-ANDROID: "{{.*}}ld{{(.exe)?}}"
832832
// CHECK-CFI-CROSS-DSO-ANDROID: libclang_rt.builtins.a
833833
// CHECK-CFI-CROSS-DSO-ANDROID: libclang_rt.builtins.a
834834

@@ -839,7 +839,7 @@
839839
// RUN: -resource-dir=%S/Inputs/resource_dir \
840840
// RUN: --sysroot=%S/Inputs/basic_android_tree \
841841
// RUN: | %{filecheck} --check-prefix=CHECK-CFI-CROSS-DSO-DIAG-ANDROID
842-
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "{{.*}}ld"
842+
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "{{.*}}ld{{(.exe)?}}"
843843
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "{{[^"]*}}libclang_rt.ubsan_standalone.so"
844844
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: "--export-dynamic-symbol=__cfi_check"
845845
// CHECK-CFI-CROSS-DSO-DIAG-ANDROID: libclang_rt.builtins.a
@@ -1002,7 +1002,7 @@
10021002
// RUN: --sysroot=%S/Inputs/basic_android_tree \
10031003
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-ANDROID-ARM
10041004
//
1005-
// CHECK-SAFESTACK-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld"
1005+
// CHECK-SAFESTACK-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
10061006
// CHECK-SAFESTACK-ANDROID-ARM: libclang_rt.builtins.a
10071007
// CHECK-SAFESTACK-ANDROID-ARM: libclang_rt.builtins.a
10081008

@@ -1011,7 +1011,7 @@
10111011
// RUN: --sysroot=%S/Inputs/basic_android_tree \
10121012
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-SHARED-ANDROID-ARM
10131013
//
1014-
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld"
1014+
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
10151015
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: libclang_rt.builtins.a
10161016
// CHECK-SAFESTACK-SHARED-ANDROID-ARM: libclang_rt.builtins.a
10171017

@@ -1020,7 +1020,7 @@
10201020
// RUN: --sysroot=%S/Inputs/basic_android_tree \
10211021
// RUN: | %{filecheck} --check-prefix=CHECK-SAFESTACK-ANDROID-AARCH64
10221022
//
1023-
// CHECK-SAFESTACK-ANDROID-AARCH64: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld"
1023+
// CHECK-SAFESTACK-ANDROID-AARCH64: "{{(.*[^-.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
10241024
// CHECK-SAFESTACK-ANDROID-AARCH64: libclang_rt.builtins.a
10251025
// CHECK-SAFESTACK-ANDROID-AARCH64: libclang_rt.builtins.a
10261026

@@ -1123,7 +1123,7 @@
11231123
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
11241124
// RUN: | %{filecheck} --check-prefix=CHECK-SCUDO-ANDROID
11251125
//
1126-
// CHECK-SCUDO-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
1126+
// CHECK-SCUDO-ANDROID: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
11271127
// CHECK-SCUDO-ANDROID-NOT: "-lc"
11281128
// CHECK-SCUDO-ANDROID: "-pie"
11291129
// CHECK-SCUDO-ANDROID-NOT: "-lpthread"
@@ -1139,7 +1139,7 @@
11391139
// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \
11401140
// RUN: -static-libsan \
11411141
// RUN: | %{filecheck} --check-prefix=CHECK-SCUDO-ANDROID-STATIC
1142-
// CHECK-SCUDO-ANDROID-STATIC: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld"
1142+
// CHECK-SCUDO-ANDROID-STATIC: "{{(.*[^.0-9A-Z_a-z])?}}ld.lld{{(.exe)?}}"
11431143
// CHECK-SCUDO-ANDROID-STATIC: "-pie"
11441144
// CHECK-SCUDO-ANDROID-STATIC: "--whole-archive" "{{.*}}libclang_rt.scudo_standalone.a" "--no-whole-archive"
11451145
// CHECK-SCUDO-ANDROID-STATIC-NOT: "-lstdc++"

0 commit comments

Comments
 (0)