1 files changed, 28 insertions, 60 deletions
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 06e114cb..d75eb527 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -26,25 +26,24 @@
         "cmd": {
           "path": "../../usr/bin/clang-tidy",
           "args": [
-            "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+            "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
             "main.cc",
             "--",
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -52,9 +51,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -67,19 +63,18 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -87,9 +82,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -126,25 +118,24 @@
         "cmd": {
           "path": "../../usr/bin/clang-tidy",
           "args": [
-            "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+            "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
             "main.cc",
             "--",
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -152,9 +143,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -168,19 +156,18 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -188,9 +175,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -229,25 +213,24 @@
         "cmd": {
           "path": "../../usr/bin/clang-tidy",
           "args": [
-            "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+            "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
             "main.cc",
             "--",
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -255,9 +238,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -274,19 +254,18 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -294,9 +273,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -336,25 +312,24 @@
         "cmd": {
           "path": "../../usr/bin/clang-tidy",
           "args": [
-            "-checks=*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-readability*,-google-runtime-references,-hicpp-*,-llvm-*,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
+            "-checks=*,google*,-bugprone-narrowing-conversions,-cppcoreguidelines-*,-fuchsia-*,-google-build-using-namespace,-google-default-arguments,-google-explicit-constructor,-google-readability*,-google-runtime-int,-google-runtime-references,-hicpp-avoid-c-arrays,-hicpp-braces-around-statements,-hicpp-no-array-decay,-hicpp-signed-bitwise,-hicpp-uppercase-literal-suffix,-hicpp-use-auto,-llvm-namespace-comment,-misc-non-private-member-variables-in-classes,-misc-unused-parameters,-modernize-*,-readability-*",
             "main.cc",
             "--",
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -362,9 +337,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -378,19 +350,18 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
+            "-grecord-gcc-switches",
             "-fno-addrsig",
-            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
             "-fuse-ld=lld",
+            "-Wno-reorder-init-list",
             "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -398,9 +369,6 @@
             "-fno-omit-frame-pointer",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
-            "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation",
-            "-mno-movbe",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"