toolchain_utils: Upgrade compiler wrapper for llvm r370808.

BUG=chromium:1001317
TEST=In progress

Change-Id: I78481d2ca3f555d670e7e5972e547f94d2be22a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1888745
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Tobias Bosch <tbosch@google.com>
Commit-Queue: Caroline Tice <cmtice@chromium.org>
Tested-by: Caroline Tice <cmtice@chromium.org>

10 files changed, 355 insertions, 0 deletions

diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 4bc696d3..b97c379d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -32,7 +32,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -81,7 +86,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -133,7 +143,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index d7b5258d..ae4a85c3 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -23,8 +23,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -63,8 +68,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-eabi"
@@ -103,8 +113,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-win-gnu"
@@ -143,9 +158,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-linux-gnu"
@@ -184,8 +204,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-eabi"
@@ -224,9 +249,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-win-gnu"
@@ -265,9 +295,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-linux-gnu"
@@ -306,8 +341,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-eabi"
@@ -346,9 +386,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
index e78a420a..bf91b019 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json
@@ -22,7 +22,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -60,7 +65,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-eabi"
@@ -98,7 +108,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-win-gnu"
@@ -136,8 +151,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-linux-gnu"
@@ -175,7 +195,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-eabi"
@@ -213,8 +238,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-win-gnu"
@@ -252,8 +282,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-linux-gnu"
@@ -291,7 +326,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-eabi"
@@ -329,8 +369,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index 2a30100c..2f843529 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -22,7 +22,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -63,7 +68,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -104,7 +114,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -145,7 +160,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -193,9 +213,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -246,9 +271,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -293,9 +323,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -336,7 +371,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -374,7 +414,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -412,7 +457,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -450,7 +500,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -491,7 +546,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index 386e82d6..9cc90057 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -24,8 +24,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -65,8 +70,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -106,8 +116,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -147,8 +162,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -187,9 +207,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=fuzzer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -229,10 +254,15 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fno-experimental-new-pass-manager",
             "-fsanitize=address",
             "-fprofile-instr-generate",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -271,8 +301,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fsanitize=address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -311,8 +346,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fprofile-instr-generate",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index c8d16bfe..c1c78dc2 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -33,7 +33,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -72,8 +77,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-Wno-#warnings",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -112,8 +122,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-Wno-error=uninitialized",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -152,8 +167,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-Wno-error=unused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -192,8 +212,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-Wno-unused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -232,8 +257,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-Wunused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -272,8 +302,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-someflag",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
index d0788a6b..46c0c832 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
@@ -53,7 +53,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -94,7 +99,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -127,7 +137,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -166,9 +181,14 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -207,10 +227,15 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "-mthumb",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7a-cros-linux-gnueabihf"
@@ -248,8 +273,13 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "--sysroot=xyz",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 22dd9ddc..3a15badd 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -37,7 +37,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -55,7 +60,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -103,7 +113,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -122,7 +137,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -172,7 +192,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -194,7 +219,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -245,7 +275,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -264,7 +299,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
index a99c1067..787ce95d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -25,7 +25,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -66,7 +71,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -93,7 +103,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -137,7 +152,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -164,7 +184,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
index 81b81a2f..c8db8869 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -22,7 +22,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -80,7 +85,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -132,7 +142,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -172,7 +187,12 @@
             "-Wno-unknown-warning-option",
             "-Wno-section",
             "-static-libgcc",
+            "-Wno-reorder-init-list",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-return-stack-address",
+            "-Werror=poison-system-directories",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",