compiler_wrapper: redisable unused-but-set-var

This CL add the Wno-unused-but-set-variable flag back into the compiler
wrapper. It was previously removed, but there are still occurances of
the warning and so we were never able to bundle that change into
chromoumos-overlay/llvm. An attempt to revert the original CL failed due
to a merge conflict.

BUG=b:227655984
TEST=None

Change-Id: Ic148a6ae577d5e4394249693ce9b09b95cb9df16
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3868978
Commit-Queue: Ryan Beltran <ryanbeltran@chromium.org>
Reviewed-by: George Burgess <gbiv@chromium.org>
Tested-by: Ryan Beltran <ryanbeltran@chromium.org>
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>

40 files changed, 260 insertions, 0 deletions

diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 9f49e259..6717d503 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -130,6 +130,7 @@ func crosCommonClangPostFlags() []string {
 	return []string{
 		"-Wno-compound-token-split-by-space",
 		"-Wno-deprecated-copy",
+		"-Wno-unused-but-set-variable",
 		"-Wno-implicit-int-float-conversion",
 		"-Wno-string-concatenation",
 	}
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index 2762eb64..6993499c 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -44,6 +44,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ],
@@ -100,6 +101,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ],
@@ -159,6 +161,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ],
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
index ab4a2fb1..26654033 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json
@@ -35,6 +35,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -78,6 +79,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -121,6 +123,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -164,6 +167,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -207,6 +211,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -250,6 +255,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -293,6 +299,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -336,6 +343,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -379,6 +387,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
index de144078..b151051c 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json
@@ -34,6 +34,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
index 288a9a81..396bb95c 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json
@@ -34,6 +34,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -76,6 +77,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -118,6 +120,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -160,6 +163,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -202,6 +206,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -244,6 +249,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -286,6 +292,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -328,6 +335,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -370,6 +378,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
index dd4bc1e4..f32a7045 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -34,6 +34,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -79,6 +80,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -124,6 +126,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -169,6 +172,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -223,6 +227,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -280,6 +285,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -337,6 +343,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -382,6 +389,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -424,6 +432,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -466,6 +475,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -508,6 +518,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -553,6 +564,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
index 4836dda4..8df51096 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json
@@ -37,6 +37,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -82,6 +83,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -127,6 +129,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -172,6 +175,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -216,6 +220,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -262,6 +267,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -306,6 +312,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -350,6 +357,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
index 4bd6a4d1..7c296af9 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json
@@ -52,6 +52,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -96,6 +97,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -140,6 +142,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -184,6 +187,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 4191fc6c..c1cf0507 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -50,6 +50,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -79,6 +80,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -138,6 +140,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -167,6 +170,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -228,6 +232,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -260,6 +265,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -322,6 +328,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -351,6 +358,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
index ddcaa2e7..ad290b45 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json
@@ -37,6 +37,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -82,6 +83,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -113,6 +115,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-Wno-error",
@@ -162,6 +165,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation"
           ]
@@ -193,6 +197,7 @@
             "main.cc",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-Wno-error",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index a397865c..8bd823ed 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -53,6 +53,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -125,6 +126,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -200,6 +202,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 da680ac7..56f78efa 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
@@ -45,6 +45,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -107,6 +108,7 @@
             "-L/usr/x86_64-cros-eabi/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -169,6 +171,7 @@
             "-L/usr/x86_64-cros-win-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -231,6 +234,7 @@
             "-L/usr/armv7m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -292,6 +296,7 @@
             "-L/usr/armv7m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -353,6 +358,7 @@
             "-L/usr/armv7m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -414,6 +420,7 @@
             "-L/usr/armv8m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -475,6 +482,7 @@
             "-L/usr/armv8m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -536,6 +544,7 @@
             "-L/usr/armv8m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
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 ab79c13b..db2f59aa 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
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -103,6 +104,7 @@
             "-L/usr/x86_64-cros-eabi/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -163,6 +165,7 @@
             "-L/usr/x86_64-cros-win-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -223,6 +226,7 @@
             "-L/usr/armv7m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -282,6 +286,7 @@
             "-L/usr/armv7m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -341,6 +346,7 @@
             "-L/usr/armv7m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -400,6 +406,7 @@
             "-L/usr/armv8m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -459,6 +466,7 @@
             "-L/usr/armv8m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -518,6 +526,7 @@
             "-L/usr/armv8m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 5c0bdc71..186a16ed 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -106,6 +107,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -169,6 +171,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -232,6 +235,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -304,6 +308,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -379,6 +384,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -449,6 +455,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -512,6 +519,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -572,6 +580,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -632,6 +641,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -692,6 +702,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -755,6 +766,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 0e92dbe0..6a38e845 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -45,6 +45,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -107,6 +108,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -169,6 +171,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -231,6 +234,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -292,6 +296,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -355,6 +360,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -416,6 +422,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -478,6 +485,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 e4cc49ee..ec91216d 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -61,6 +61,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -123,6 +124,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -185,6 +187,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -247,6 +250,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 93e7f0e2..0ad97b7a 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
@@ -79,6 +79,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -142,6 +143,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -199,6 +201,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -261,6 +264,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -323,6 +327,7 @@
             "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -383,6 +388,7 @@
             "-Lxyz/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index dd96e907..f7438940 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -58,6 +58,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -99,6 +100,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -170,6 +172,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -212,6 +215,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -285,6 +289,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -330,6 +335,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -404,6 +410,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -446,6 +453,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 659253f7..9cd72611 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -46,6 +46,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -109,6 +110,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -158,6 +160,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -225,6 +228,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -274,6 +278,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 e1e146e9..d9b532f0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -128,6 +129,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -208,6 +210,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -271,6 +274,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index a397865c..8bd823ed 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -53,6 +53,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -125,6 +126,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -200,6 +202,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
index 5c0bdc71..186a16ed 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -106,6 +107,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -169,6 +171,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -232,6 +235,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -304,6 +308,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -379,6 +384,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -449,6 +455,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -512,6 +519,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -572,6 +580,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -632,6 +641,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -692,6 +702,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -755,6 +766,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index dd96e907..f7438940 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -58,6 +58,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -99,6 +100,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -170,6 +172,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -212,6 +215,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -285,6 +289,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -330,6 +335,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -404,6 +410,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -446,6 +453,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
index 659253f7..9cd72611 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json
@@ -46,6 +46,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -109,6 +110,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -158,6 +160,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -225,6 +228,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -274,6 +278,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
index e1e146e9..d9b532f0 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -128,6 +129,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -208,6 +210,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -271,6 +274,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index d834d581..da522b99 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -52,6 +52,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -120,6 +121,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -191,6 +193,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
index d1ef5fe5..287833cf 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -42,6 +42,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -99,6 +100,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -156,6 +158,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -213,6 +216,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -279,6 +283,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -349,6 +354,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -418,6 +424,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -475,6 +482,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -529,6 +537,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -583,6 +592,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -637,6 +647,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -694,6 +705,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index dd96e907..f7438940 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -58,6 +58,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -99,6 +100,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -170,6 +172,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -212,6 +215,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -285,6 +289,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -330,6 +335,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -404,6 +410,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -446,6 +453,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
index 0818bca1..54943fb3 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json
@@ -45,6 +45,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -102,6 +103,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -145,6 +147,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -206,6 +209,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -249,6 +253,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
index ff82f64e..1704cd17 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json
@@ -43,6 +43,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -123,6 +124,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -203,6 +205,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -266,6 +269,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 4c025df8..96fd88cf 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -46,6 +46,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -111,6 +112,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -179,6 +181,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 4c99f2bb..35f90b1e 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
@@ -38,6 +38,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -93,6 +94,7 @@
             "-L/usr/x86_64-cros-eabi/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -148,6 +150,7 @@
             "-L/usr/x86_64-cros-win-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -204,6 +207,7 @@
             "-L/usr/armv7m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -258,6 +262,7 @@
             "-L/usr/armv7m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -313,6 +318,7 @@
             "-L/usr/armv7m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -368,6 +374,7 @@
             "-L/usr/armv8m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -422,6 +429,7 @@
             "-L/usr/armv8m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -477,6 +485,7 @@
             "-L/usr/armv8m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
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 dbed527c..e2479e9b 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
@@ -36,6 +36,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -89,6 +90,7 @@
             "-L/usr/x86_64-cros-eabi/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -142,6 +144,7 @@
             "-L/usr/x86_64-cros-win-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -196,6 +199,7 @@
             "-L/usr/armv7m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -248,6 +252,7 @@
             "-L/usr/armv7m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -301,6 +306,7 @@
             "-L/usr/armv7m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -354,6 +360,7 @@
             "-L/usr/armv8m-cros-linux-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -406,6 +413,7 @@
             "-L/usr/armv8m-cros-eabi/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -459,6 +467,7 @@
             "-L/usr/armv8m-cros-win-gnu/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index 6fb3b088..11c566b6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -36,6 +36,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -92,6 +93,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -148,6 +150,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -204,6 +207,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -269,6 +273,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -337,6 +342,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -400,6 +406,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -456,6 +463,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -509,6 +517,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -562,6 +571,7 @@
             "-L/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -615,6 +625,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -671,6 +682,7 @@
             "-L/tmp/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 9ec3cd06..fe0df74d 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -39,6 +39,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -95,6 +96,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -151,6 +153,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -207,6 +210,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -262,6 +266,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -319,6 +324,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -374,6 +380,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -429,6 +436,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 537df6ff..b744e8c6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -54,6 +54,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -109,6 +110,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -164,6 +166,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -219,6 +222,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 860fc798..ed3a6ef1 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
@@ -69,6 +69,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -125,6 +126,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -175,6 +177,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -231,6 +234,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -288,6 +292,7 @@
             "-L/usr/armv7a-cros-linux-gnueabihf/usr/lib",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-B../../bin",
@@ -341,6 +346,7 @@
             "-Lxyz/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 30f9466d..830abee6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -51,6 +51,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -85,6 +86,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -149,6 +151,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -184,6 +187,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -250,6 +254,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -288,6 +293,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -355,6 +361,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -390,6 +397,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 df6e8c7f..07c20900 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -39,6 +39,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -95,6 +96,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -137,6 +139,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -197,6 +200,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -239,6 +243,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
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 77225038..9dd5687b 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -36,6 +36,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -111,6 +112,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -181,6 +183,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",
@@ -237,6 +240,7 @@
             "-L/usr/x86_64-cros-linux-gnu/usr/lib64",
             "-Wno-compound-token-split-by-space",
             "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-implicit-int-float-conversion",
             "-Wno-string-concatenation",
             "-mno-movbe",