1 files changed, 63 insertions, 63 deletions
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",