compiler_wrapper: sort clangFlags; partition for dedup

This CL sorts clang flags, and puts ones shared across all CrOS
configurations into their own textual blocks. This should make factoring
these out into their own function not require golden updates, which
makes verifying the CL that actually _does_ that simpler.

BUG=b:232114933
TEST=go test

Change-Id: I7dc6110d680505d4ad2af98709730e85c386ae5d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3639682
Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com>
Tested-by: George Burgess <gbiv@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>

40 files changed, 2223 insertions, 2220 deletions

diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 7e6e4896..13df2b9f 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -144,20 +144,21 @@ var crosHardenedConfig = config{
 
 	clangFlags: []string{
 		"-Qunused-arguments",
-		"-fno-addrsig",
-		"-fdebug-default-version=5",
+		"-Werror=poison-system-directories",
+		"-Wno-compound-token-split-by-macro",
+		"-Wno-deprecated-declarations",
+		"-Wno-error=implicit-function-declaration",
+		"-Wno-final-dtor-non-final-class",
 		"-Wno-tautological-constant-compare",
 		"-Wno-tautological-unsigned-enum-zero-compare",
 		"-Wno-unknown-warning-option",
+		"-fdebug-default-version=5",
+		"-fexperimental-new-pass-manager",
+
+		"--unwindlib=libunwind",
 		"-Wno-section",
+		"-fno-addrsig",
 		"-fuse-ld=lld",
-		"--unwindlib=libunwind",
-		"-Wno-final-dtor-non-final-class",
-		"-Werror=poison-system-directories",
-		"-fexperimental-new-pass-manager",
-		"-Wno-compound-token-split-by-macro",
-		"-Wno-deprecated-declarations",
-		"-Wno-error=implicit-function-declaration",
 	},
 
 	clangPostFlags:    crosCommonClangPostFlags(),
@@ -184,17 +185,18 @@ var crosNonHardenedConfig = config{
 	// b/230345382: Temporarily disable Wimplicit-function-declaration.
 	clangFlags: []string{
 		"-Qunused-arguments",
-		"-fdebug-default-version=5",
-		"-Wno-tautological-constant-compare",
-		"-Wno-tautological-unsigned-enum-zero-compare",
-		"-Wno-unknown-warning-option",
-		"-Wno-section",
-		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
-		"-fexperimental-new-pass-manager",
 		"-Wno-compound-token-split-by-macro",
 		"-Wno-deprecated-declarations",
 		"-Wno-error=implicit-function-declaration",
+		"-Wno-final-dtor-non-final-class",
+		"-Wno-tautological-constant-compare",
+		"-Wno-tautological-unsigned-enum-zero-compare",
+		"-Wno-unknown-warning-option",
+		"-fdebug-default-version=5",
+		"-fexperimental-new-pass-manager",
+
+		"-Wno-section",
 	},
 
 	clangPostFlags:    crosCommonClangPostFlags(),
@@ -226,19 +228,20 @@ var crosHostConfig = config{
 	// b/230345382: Temporarily disable Wimplicit-function-declaration.
 	clangFlags: []string{
 		"-Qunused-arguments",
-		"-fno-addrsig",
-		"-fuse-ld=lld",
-		"-fdebug-default-version=5",
-		"-Wno-unused-local-typedefs",
-		"-Wno-tautological-constant-compare",
-		"-Wno-tautological-unsigned-enum-zero-compare",
-		"-Wno-final-dtor-non-final-class",
 		"-Werror=poison-system-directories",
-		"-Wno-unknown-warning-option",
-		"-fexperimental-new-pass-manager",
 		"-Wno-compound-token-split-by-macro",
 		"-Wno-deprecated-declarations",
 		"-Wno-error=implicit-function-declaration",
+		"-Wno-final-dtor-non-final-class",
+		"-Wno-tautological-constant-compare",
+		"-Wno-tautological-unsigned-enum-zero-compare",
+		"-Wno-unknown-warning-option",
+		"-fdebug-default-version=5",
+		"-fexperimental-new-pass-manager",
+
+		"-Wno-unused-local-typedefs",
+		"-fno-addrsig",
+		"-fuse-ld=lld",
 	},
 
 	// Temporarily disable Wdeprecated-copy. b/191479033
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index 7c93a125..3e60ef45 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -25,19 +25,19 @@
             "/tmp/sysroot_bisect",
             "/tmp/stable/clang",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -80,19 +80,19 @@
             "someBisectDir",
             "/tmp/stable/clang",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -138,19 +138,19 @@
             "someBisectDir",
             "/tmp/stable/clang",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 d694f056..06fc7311 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
@@ -16,19 +16,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -58,19 +58,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -100,19 +100,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -142,19 +142,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -184,19 +184,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -226,19 +226,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -268,19 +268,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -310,19 +310,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -352,19 +352,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 bbea704d..d5fe7409 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
@@ -15,19 +15,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 30b310bb..f66a82c5 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
@@ -15,19 +15,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -56,19 +56,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -97,19 +97,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -138,19 +138,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -179,19 +179,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -220,19 +220,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -261,19 +261,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -302,19 +302,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -343,19 +343,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 f7737c4f..9cf9326c 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -15,19 +15,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -59,19 +59,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -103,19 +103,19 @@
           "path": "/tmp/stable/clang++",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -147,19 +147,19 @@
           "path": "somepath/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -198,19 +198,19 @@
           "path": "/somedir/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-resource-dir=someResourceDir",
@@ -254,19 +254,19 @@
           "path": "/somedir/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-resource-dir=someResourceDir",
@@ -310,19 +310,19 @@
           "path": "/somedir/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-resource-dir=someResourceDir",
@@ -356,19 +356,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -397,19 +397,19 @@
           "path": "/tmp/stable/a/b/c/d/e/f/g/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -438,19 +438,19 @@
           "path": "/tmp/stable/a/b/c/d/e/f/g/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -479,19 +479,19 @@
           "path": "/tmp/stable/somedir/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -523,19 +523,19 @@
           "path": "/tmp/stable/pathenv/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 15ce2829..45b5fe34 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
@@ -17,19 +17,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=kernel-address",
@@ -61,19 +61,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=kernel-address",
@@ -105,19 +105,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=kernel-address",
@@ -149,19 +149,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=kernel-address",
@@ -192,19 +192,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=fuzzer",
@@ -236,19 +236,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=address",
@@ -280,19 +280,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fsanitize=address",
@@ -323,19 +323,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fprofile-instr-generate",
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 bc7752f2..141206f9 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
@@ -25,19 +25,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-mno-movbe",
@@ -75,19 +75,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-#warnings",
@@ -118,19 +118,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-Wno-error=uninitialized",
@@ -161,19 +161,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-someflag",
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 807a9d60..04640bc4 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -31,19 +31,19 @@
             "--",
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -59,19 +59,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -117,19 +117,19 @@
             "--",
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -145,19 +145,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -205,19 +205,19 @@
             "--",
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -236,19 +236,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -297,19 +297,19 @@
             "--",
             "-resource-dir=someResourceDir",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -325,19 +325,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
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 31d16d6b..8425fa7a 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
@@ -18,19 +18,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -62,19 +62,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -92,19 +92,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -140,19 +140,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
@@ -170,19 +170,19 @@
           "path": "/tmp/stable/clang",
           "args": [
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fuse-ld=lld",
-            "-fdebug-default-version=5",
-            "-Wno-unused-local-typedefs",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-Wno-unknown-warning-option",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-unused-local-typedefs",
+            "-fno-addrsig",
+            "-fuse-ld=lld",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "main.cc",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index 66048f3e..60958ea2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -27,20 +27,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -100,20 +100,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -176,20 +176,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 3b40bb54..25d09d7e 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
@@ -18,20 +18,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -81,20 +81,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -144,20 +144,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -207,20 +207,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -269,20 +269,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -331,20 +331,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -393,20 +393,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -455,20 +455,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -517,20 +517,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 2c8568f1..8f963a4a 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
@@ -17,20 +17,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -78,20 +78,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -139,20 +139,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -200,20 +200,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -260,20 +260,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -320,20 +320,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -380,20 +380,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -440,20 +440,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-eabi",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -500,20 +500,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 33b280ea..262a5e88 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -17,20 +17,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -81,20 +81,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -145,20 +145,20 @@
             "../../usr/bin/clang++",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -209,20 +209,20 @@
             "somepath/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -280,20 +280,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -356,20 +356,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -427,20 +427,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -493,20 +493,20 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -554,20 +554,20 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -615,20 +615,20 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -676,20 +676,20 @@
             "../usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -740,20 +740,20 @@
             "/tmp/usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 4817cc2a..d21f41db 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -19,20 +19,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -82,20 +82,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -145,20 +145,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -208,20 +208,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -270,20 +270,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -333,20 +333,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -396,20 +396,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -458,20 +458,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 0b61ab7d..03e1aecd 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -27,20 +27,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -97,20 +97,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -160,20 +160,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -223,20 +223,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 6cbb7e3a..a822dede 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
@@ -55,20 +55,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -119,20 +119,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -176,20 +176,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -236,20 +236,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-D_FORTIFY_SOURCE=2",
@@ -297,20 +297,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7a-cros-linux-gnueabihf",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-D_FORTIFY_SOURCE=2",
@@ -356,20 +356,20 @@
           "args": [
             "../../usr/bin/clang",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 090f3c1a..a9b62d93 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -32,20 +32,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -74,20 +74,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -146,20 +146,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -189,20 +189,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -263,20 +263,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -309,20 +309,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -384,20 +384,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -427,20 +427,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 a17b11eb..2ee2cd01 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -20,20 +20,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -84,20 +84,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -134,20 +134,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -202,20 +202,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -252,20 +252,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 124cf478..d799a0a0 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -17,20 +17,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -105,20 +105,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -188,20 +188,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -252,20 +252,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index 66048f3e..60958ea2 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -27,20 +27,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -100,20 +100,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -176,20 +176,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 33b280ea..262a5e88 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -17,20 +17,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -81,20 +81,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -145,20 +145,20 @@
             "../../usr/bin/clang++",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -209,20 +209,20 @@
             "somepath/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -280,20 +280,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -356,20 +356,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -427,20 +427,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -493,20 +493,20 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -554,20 +554,20 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -615,20 +615,20 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -676,20 +676,20 @@
             "../usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -740,20 +740,20 @@
             "/tmp/usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 090f3c1a..a9b62d93 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -32,20 +32,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -74,20 +74,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -146,20 +146,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -189,20 +189,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -263,20 +263,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -309,20 +309,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -384,20 +384,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -427,20 +427,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 a17b11eb..2ee2cd01 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
@@ -20,20 +20,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -84,20 +84,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -134,20 +134,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -202,20 +202,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -252,20 +252,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 124cf478..d799a0a0 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
@@ -17,20 +17,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -105,20 +105,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -188,20 +188,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -252,20 +252,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index 3ea27130..298ac342 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -26,20 +26,20 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -95,20 +95,20 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -167,20 +167,20 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 146c07cb..324f66c6 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -16,20 +16,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -74,20 +74,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -132,20 +132,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -190,20 +190,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -255,20 +255,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -326,20 +326,20 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -396,20 +396,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -456,20 +456,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -511,20 +511,20 @@
           "args": [
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -566,20 +566,20 @@
           "args": [
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -621,20 +621,20 @@
           "args": [
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -679,20 +679,20 @@
           "args": [
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index 090f3c1a..a9b62d93 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -32,20 +32,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -74,20 +74,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -146,20 +146,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -189,20 +189,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -263,20 +263,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -309,20 +309,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -384,20 +384,20 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -427,20 +427,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 421cff26..5036980d 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
@@ -19,20 +19,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -77,20 +77,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -121,20 +121,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -183,20 +183,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -227,20 +227,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
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 951786fd..ecab5901 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
@@ -17,20 +17,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -100,20 +100,20 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -183,20 +183,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
@@ -247,20 +247,20 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fno-addrsig",
-            "-fdebug-default-version=5",
+            "-Werror=poison-system-directories",
+            "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
+            "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "--unwindlib=libunwind",
             "-Wno-section",
+            "-fno-addrsig",
             "-fuse-ld=lld",
-            "--unwindlib=libunwind",
-            "-Wno-final-dtor-non-final-class",
-            "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
-            "-Wno-compound-token-split-by-macro",
-            "-Wno-deprecated-declarations",
-            "-Wno-error=implicit-function-declaration",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-fcommon",
             "-fstack-protector-strong",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index 86f73ed2..6f9363ac 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -27,17 +27,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -91,17 +91,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -158,17 +158,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json
index 1799eafe..7b19f239 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
@@ -18,17 +18,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -72,17 +72,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-eabi-",
@@ -126,17 +126,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-win-gnu-",
@@ -180,17 +180,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -234,17 +234,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/armv7m-cros-eabi-",
@@ -287,17 +287,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -341,17 +341,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -395,17 +395,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/armv8m-cros-eabi-",
@@ -448,17 +448,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
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 dff14d9b..2bbdd453 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
@@ -17,17 +17,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -69,17 +69,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-eabi-",
@@ -121,17 +121,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-win-gnu-",
@@ -173,17 +173,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -225,17 +225,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/armv7m-cros-eabi-",
@@ -276,17 +276,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -328,17 +328,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -380,17 +380,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-eabi",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/armv8m-cros-eabi-",
@@ -431,17 +431,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv8m-cros-win-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index 2d956742..2b56b48a 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -17,17 +17,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -72,17 +72,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -127,17 +127,17 @@
             "../../usr/bin/clang++",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -182,17 +182,17 @@
             "somepath/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -244,17 +244,17 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -311,17 +311,17 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -373,17 +373,17 @@
             "/somedir/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -430,17 +430,17 @@
             "/usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -482,17 +482,17 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
@@ -534,17 +534,17 @@
             "a/b/c/d/e/usr/bin/clang",
             "--sysroot=/tmp/stable/a/b/c/d/e/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=a/b/c/d/e/bin/x86_64-cros-linux-gnu-",
@@ -586,17 +586,17 @@
             "../usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../bin/x86_64-cros-linux-gnu-",
@@ -641,17 +641,17 @@
             "/tmp/usr/bin/clang",
             "--sysroot=/tmp/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
index 7cb4ed5f..a17cd381 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -19,17 +19,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -74,17 +74,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -129,17 +129,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -184,17 +184,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -238,17 +238,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -293,17 +293,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -348,17 +348,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -402,17 +402,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
index 32716a5e..196914ee 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -27,17 +27,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -88,17 +88,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -142,17 +142,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -196,17 +196,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json
index 78eb5885..3e36da96 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
@@ -50,17 +50,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -105,17 +105,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -153,17 +153,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -206,17 +206,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-fno-stack-protector",
@@ -261,17 +261,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/armv7a-cros-linux-gnueabihf",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "-mthumb",
@@ -315,17 +315,17 @@
           "args": [
             "../../usr/bin/clang",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 742e6a3a..3bb4a8aa 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -32,17 +32,17 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -65,17 +65,17 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -128,17 +128,17 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -162,17 +162,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -227,17 +227,17 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -264,17 +264,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -330,17 +330,17 @@
             "-resource-dir=someResourceDir",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -364,17 +364,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
index f3878b27..cf0d0f04 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -20,17 +20,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -75,17 +75,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -116,17 +116,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -175,17 +175,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -216,17 +216,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
index a428983e..15ba7ae6 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -17,17 +17,17 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -91,17 +91,17 @@
             "../../usr/bin/clang",
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -160,17 +160,17 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",
@@ -215,17 +215,17 @@
           "args": [
             "--sysroot=/usr/x86_64-cros-linux-gnu",
             "-Qunused-arguments",
-            "-fdebug-default-version=5",
-            "-Wno-tautological-constant-compare",
-            "-Wno-tautological-unsigned-enum-zero-compare",
-            "-Wno-unknown-warning-option",
-            "-Wno-section",
-            "-Wno-final-dtor-non-final-class",
             "-Werror=poison-system-directories",
-            "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
             "-Wno-deprecated-declarations",
             "-Wno-error=implicit-function-declaration",
+            "-Wno-final-dtor-non-final-class",
+            "-Wno-tautological-constant-compare",
+            "-Wno-tautological-unsigned-enum-zero-compare",
+            "-Wno-unknown-warning-option",
+            "-fdebug-default-version=5",
+            "-fexperimental-new-pass-manager",
+            "-Wno-section",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
             "-static-libgcc",
             "--prefix=../../bin/x86_64-cros-linux-gnu-",