compiler_wrapper: Stop disabling two warnings.

Chrome OS code now is clean of following warnings:
"-Wreorder-init-list" and "-return-stack-address" so
stop disabling them.

BUG=chromium:1057384
TEST=warnings tested by CL:1898670

Change-Id: I568cf93a9e836ba936ea976312e9a78b5c473157
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/2081707
Tested-by: Manoj Gupta <manojgupta@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>

10 files changed, 0 insertions, 142 deletions

diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index a6ac7a19..aa9d3853 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -35,9 +35,7 @@
             "-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",
@@ -98,9 +96,7 @@
             "-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",
@@ -164,9 +160,7 @@
             "-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",
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 f71551be..3e4cb4bc 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,9 +26,7 @@
             "-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",
@@ -79,9 +77,7 @@
             "-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",
@@ -132,9 +128,7 @@
             "-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",
@@ -185,9 +179,7 @@
             "-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",
@@ -238,9 +230,7 @@
             "-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",
@@ -291,9 +281,7 @@
             "-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",
@@ -344,9 +332,7 @@
             "-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",
@@ -397,9 +383,7 @@
             "-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",
@@ -450,9 +434,7 @@
             "-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",
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 0dae3e82..8ba250d6 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,9 +25,7 @@
             "-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",
@@ -76,9 +74,7 @@
             "-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",
@@ -127,9 +123,7 @@
             "-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",
@@ -178,9 +172,7 @@
             "-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",
@@ -229,9 +221,7 @@
             "-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",
@@ -280,9 +270,7 @@
             "-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",
@@ -331,9 +319,7 @@
             "-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",
@@ -382,9 +368,7 @@
             "-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",
@@ -433,9 +417,7 @@
             "-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",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 6932398b..abf34e8b 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -25,9 +25,7 @@
             "-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",
@@ -79,9 +77,7 @@
             "-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",
@@ -133,9 +129,7 @@
             "-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",
@@ -187,9 +181,7 @@
             "-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",
@@ -248,9 +240,7 @@
             "-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",
@@ -314,9 +304,7 @@
             "-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",
@@ -374,9 +362,7 @@
             "-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",
@@ -430,9 +416,7 @@
             "-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",
@@ -481,9 +465,7 @@
             "-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",
@@ -532,9 +514,7 @@
             "-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",
@@ -583,9 +563,7 @@
             "-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",
@@ -637,9 +615,7 @@
             "-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",
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 398b6d5c..8ce50182 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -27,9 +27,7 @@
             "-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",
@@ -80,9 +78,7 @@
             "-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",
@@ -133,9 +129,7 @@
             "-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",
@@ -186,9 +180,7 @@
             "-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",
@@ -238,9 +230,7 @@
             "-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",
@@ -292,9 +282,7 @@
             "-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",
@@ -346,9 +334,7 @@
             "-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",
@@ -398,9 +384,7 @@
             "-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",
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 a1a05c22..eb12523b 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -36,9 +36,7 @@
             "-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",
@@ -88,9 +86,7 @@
             "-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",
@@ -141,9 +137,7 @@
             "-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",
@@ -194,9 +188,7 @@
             "-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",
@@ -247,9 +239,7 @@
             "-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",
@@ -300,9 +290,7 @@
             "-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",
@@ -353,9 +341,7 @@
             "-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",
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 161bad6f..5ea9e300 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,9 +60,7 @@
             "-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",
@@ -114,9 +112,7 @@
             "-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",
@@ -160,9 +156,7 @@
             "-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",
@@ -210,9 +204,7 @@
             "-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",
@@ -261,9 +253,7 @@
             "-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",
@@ -311,9 +301,7 @@
             "-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",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index d75eb527..b047adec 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -40,9 +40,7 @@
             "-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",
@@ -71,9 +69,7 @@
             "-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",
@@ -132,9 +128,7 @@
             "-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",
@@ -164,9 +158,7 @@
             "-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",
@@ -227,9 +219,7 @@
             "-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",
@@ -262,9 +252,7 @@
             "-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",
@@ -326,9 +314,7 @@
             "-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",
@@ -358,9 +344,7 @@
             "-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",
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 f796764a..87befee3 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -28,9 +28,7 @@
             "-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",
@@ -82,9 +80,7 @@
             "-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",
@@ -122,9 +118,7 @@
             "-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",
@@ -180,9 +174,7 @@
             "-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",
@@ -220,9 +212,7 @@
             "-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",
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 b9582f6d..dd0a4f4d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -25,9 +25,7 @@
             "-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",
@@ -100,9 +98,7 @@
             "-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",
@@ -169,9 +165,7 @@
             "-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",
@@ -222,9 +216,7 @@
             "-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",