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_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index f9a503f3..c1daaa88 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -35,12 +35,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -92,12 +97,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -152,12 +162,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
index 847d0e5f..f71551be 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json
@@ -26,6 +26,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -33,6 +37,7 @@
             "-fno-omit-frame-pointer",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -74,6 +79,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -81,6 +90,7 @@
             "-fno-omit-frame-pointer",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-eabi"
@@ -122,6 +132,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -129,6 +143,7 @@
             "-fno-omit-frame-pointer",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-win-gnu"
@@ -170,6 +185,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -177,6 +196,7 @@
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-linux-gnu"
@@ -218,6 +238,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -225,6 +249,7 @@
             "-fno-omit-frame-pointer",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-eabi"
@@ -266,6 +291,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -273,6 +302,7 @@
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-win-gnu"
@@ -314,6 +344,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -321,6 +355,7 @@
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-linux-gnu"
@@ -362,6 +397,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -369,6 +408,7 @@
             "-fno-omit-frame-pointer",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-eabi"
@@ -410,6 +450,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -417,6 +461,7 @@
             "-mthumb",
             "-ftrapv",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
index 15241001..0dae3e82 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json
@@ -25,12 +25,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -71,12 +76,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-eabi"
@@ -117,12 +127,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-win-gnu"
@@ -163,12 +178,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-linux-gnu"
@@ -209,12 +229,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-eabi"
@@ -255,12 +280,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7m-cros-win-gnu"
@@ -301,12 +331,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-linux-gnu"
@@ -347,12 +382,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-eabi"
@@ -393,12 +433,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv8m-cros-win-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 86cead04..6932398b 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -25,12 +25,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -74,12 +79,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -123,12 +133,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -172,12 +187,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -228,6 +248,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -236,6 +260,7 @@
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -289,6 +314,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -297,6 +326,7 @@
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -344,6 +374,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -352,6 +386,7 @@
             "-resource-dir=someResourceDir",
             "--gcc-toolchain=/usr",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -395,12 +430,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -441,12 +481,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -487,12 +532,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-Ba/b/bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -533,12 +583,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -582,12 +637,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
index 39094948..398b6d5c 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -27,12 +27,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-fno-omit-frame-pointer",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -75,12 +80,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-fno-omit-frame-pointer",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -123,12 +133,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-fno-omit-frame-pointer",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -171,12 +186,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-fno-omit-frame-pointer",
             "-fsanitize=kernel-address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -218,6 +238,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -225,6 +249,7 @@
             "-fno-experimental-new-pass-manager",
             "-fsanitize=fuzzer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -267,6 +292,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -275,6 +304,7 @@
             "-fsanitize=address",
             "-fprofile-instr-generate",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -316,12 +346,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-fno-omit-frame-pointer",
             "-fsanitize=address",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -363,6 +398,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -370,6 +409,7 @@
             "-fno-omit-frame-pointer",
             "-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_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
index c9ad6e46..a1a05c22 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -36,12 +36,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -83,6 +88,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -90,6 +99,7 @@
             "-fno-omit-frame-pointer",
             "-Wno-#warnings",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -131,6 +141,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -138,6 +152,7 @@
             "-fno-omit-frame-pointer",
             "-Wno-error=uninitialized",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -179,6 +194,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -186,6 +205,7 @@
             "-fno-omit-frame-pointer",
             "-Wno-error=unused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -227,6 +247,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -234,6 +258,7 @@
             "-fno-omit-frame-pointer",
             "-Wno-unused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -275,6 +300,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -282,6 +311,7 @@
             "-fno-omit-frame-pointer",
             "-Wunused-variable",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -323,6 +353,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -330,6 +364,7 @@
             "-fno-omit-frame-pointer",
             "-someflag",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
index ff68d4bd..161bad6f 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json
@@ -60,12 +60,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -109,12 +114,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -150,10 +160,15 @@
             "-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",
             "-fstack-protector-strong",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -195,11 +210,16 @@
             "-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",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -241,11 +261,16 @@
             "-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",
             "-D_FORTIFY_SOURCE=2",
             "-mthumb",
             "-fno-stack-protector",
             "-D__KERNEL__",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "armv7a-cros-linux-gnueabihf"
@@ -286,6 +311,10 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
@@ -293,6 +322,7 @@
             "-fno-omit-frame-pointer",
             "--sysroot=xyz",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 03d0c437..d75eb527 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -40,12 +40,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -66,12 +71,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -122,12 +132,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -149,12 +164,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -207,12 +227,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -237,12 +262,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -296,12 +326,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -323,12 +358,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
index f80d9b65..f975f452 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -28,12 +28,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -77,12 +82,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -112,12 +122,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -164,12 +179,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu"
@@ -199,12 +219,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
index b9778247..b9582f6d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -25,12 +25,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -95,12 +100,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -159,12 +169,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",
@@ -207,12 +222,17 @@
             "-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",
             "-fstack-protector-strong",
             "-fPIE",
             "-pie",
             "-D_FORTIFY_SOURCE=2",
             "-fno-omit-frame-pointer",
             "main.cc",
+            "-Wno-implicit-int-float-conversion",
             "-B../../bin",
             "-target",
             "x86_64-cros-linux-gnu",