1 files changed, 28 insertions, 13 deletions
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 75f5e474..f5a77714 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
@@ -19,10 +19,9 @@
           "args": [
             "-Qunused-arguments",
             "-fno-addrsig",
-            "-fcommon",
             "-fuse-ld=lld",
+            "-fdebug-default-version=5",
             "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-final-dtor-non-final-class",
@@ -30,11 +29,15 @@
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+            "-fcommon",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation"
+            "-Wno-string-concatenation",
+            "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable"
           ]
         }
       }
@@ -60,10 +63,9 @@
           "args": [
             "-Qunused-arguments",
             "-fno-addrsig",
-            "-fcommon",
             "-fuse-ld=lld",
+            "-fdebug-default-version=5",
             "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-final-dtor-non-final-class",
@@ -71,11 +73,15 @@
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+            "-fcommon",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation"
+            "-Wno-string-concatenation",
+            "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable"
           ]
         },
         "stderr": "-Werror originalerror",
@@ -87,10 +93,9 @@
           "args": [
             "-Qunused-arguments",
             "-fno-addrsig",
-            "-fcommon",
             "-fuse-ld=lld",
+            "-fdebug-default-version=5",
             "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-final-dtor-non-final-class",
@@ -98,11 +103,15 @@
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+            "-fcommon",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
+            "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-error",
             "-Wno-error=poison-system-directories"
           ]
@@ -132,10 +141,9 @@
           "args": [
             "-Qunused-arguments",
             "-fno-addrsig",
-            "-fcommon",
             "-fuse-ld=lld",
+            "-fdebug-default-version=5",
             "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-final-dtor-non-final-class",
@@ -143,11 +151,15 @@
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+            "-fcommon",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
-            "-Wno-string-concatenation"
+            "-Wno-string-concatenation",
+            "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable"
           ]
         },
         "stderr": "-Werror originalerror",
@@ -159,10 +171,9 @@
           "args": [
             "-Qunused-arguments",
             "-fno-addrsig",
-            "-fcommon",
             "-fuse-ld=lld",
+            "-fdebug-default-version=5",
             "-Wno-unused-local-typedefs",
-            "-Wno-deprecated-declarations",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-final-dtor-non-final-class",
@@ -170,11 +181,15 @@
             "-Wno-unknown-warning-option",
             "-fexperimental-new-pass-manager",
             "-Wno-compound-token-split-by-macro",
+            "-Wno-deprecated-declarations",
             "-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+            "-fcommon",
             "main.cc",
             "-Wno-implicit-int-float-conversion",
             "-Wno-compound-token-split-by-space",
             "-Wno-string-concatenation",
+            "-Wno-deprecated-copy",
+            "-Wno-unused-but-set-variable",
             "-Wno-error",
             "-Wno-error=poison-system-directories"
           ]