aboutsummaryrefslogtreecommitdiff
path: root/compiler_wrapper/testdata
diff options
context:
space:
mode:
Diffstat (limited to 'compiler_wrapper/testdata')
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/bisect.json9
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json3
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json27
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json36
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json24
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json22
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json24
-rw-r--r--compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json15
-rw-r--r--compiler_wrapper/testdata/cros_gcc_host_golden/gcc_host_wrapper.json1
-rw-r--r--compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json9
-rw-r--r--compiler_wrapper/testdata/cros_gcc_host_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_gcc_host_golden/gcc_specific_args.json3
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/bisect.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json36
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json36
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_path.json48
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json32
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json29
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json25
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json32
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json20
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json19
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json9
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json8
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json9
-rw-r--r--compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json7
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json48
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json32
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json20
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json19
-rw-r--r--compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json12
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json48
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json32
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json20
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json19
-rw-r--r--compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json6
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json6
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_ftrapv_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_maincc_target_specific.json18
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json24
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json16
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json15
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json12
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json16
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json10
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json8
-rw-r--r--compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json6
51 files changed, 751 insertions, 206 deletions
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index 1c2e5a0e..d6d1a308 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -26,8 +26,8 @@
"/tmp/stable/clang",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -38,6 +38,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -78,8 +79,8 @@
"/tmp/stable/clang",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -90,6 +91,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -133,8 +135,8 @@
"/tmp/stable/clang",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -145,6 +147,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 ec57b0d7..ce992fa3 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
@@ -17,8 +17,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -29,6 +29,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -56,8 +57,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -68,6 +69,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -95,8 +97,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -107,6 +109,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -134,8 +137,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -146,6 +149,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -173,8 +177,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -185,6 +189,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -212,8 +217,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -224,6 +229,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -251,8 +257,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -263,6 +269,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -290,8 +297,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -302,6 +309,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -329,8 +337,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -341,6 +349,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 99c12725..1411ba22 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
@@ -16,8 +16,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -28,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 9389a4d8..1e7b84d9 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
@@ -16,8 +16,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -28,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -54,8 +55,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -66,6 +67,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -92,8 +94,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -104,6 +106,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -130,8 +133,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -142,6 +145,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -168,8 +172,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -180,6 +184,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -206,8 +211,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -218,6 +223,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -244,8 +250,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -256,6 +262,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -282,8 +289,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -294,6 +301,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -320,8 +328,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -332,6 +340,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 080f1d48..56eb92c6 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -16,8 +16,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -28,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -57,8 +58,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -69,6 +70,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -98,8 +100,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -110,6 +112,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -139,8 +142,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -151,6 +154,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -187,8 +191,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -199,6 +203,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -240,8 +245,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -252,6 +257,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -293,8 +299,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -305,6 +311,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -336,8 +343,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -348,6 +355,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -374,8 +382,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -386,6 +394,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -412,8 +421,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -424,6 +433,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -450,8 +460,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -462,6 +472,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -491,8 +502,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -503,6 +514,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 0aeb2362..4e99c843 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
@@ -18,8 +18,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -30,6 +30,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -59,8 +60,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -71,6 +72,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -100,8 +102,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -112,6 +114,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -141,8 +144,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -153,6 +156,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -181,8 +185,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -193,6 +197,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fno-experimental-new-pass-manager",
"-fsanitize=fuzzer",
"main.cc",
@@ -223,8 +228,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -235,6 +240,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fno-experimental-new-pass-manager",
"-fsanitize=address",
"-fprofile-instr-generate",
@@ -265,8 +271,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -277,6 +283,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -305,8 +312,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -317,6 +324,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 bddb110e..646f464d 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
@@ -6,7 +6,6 @@
"path": "./x86_64-cros-linux-gnu-clang",
"args": [
"-mno-movbe",
- "-pass-exit-codes",
"-Wclobbered",
"-Wno-psabi",
"-Wlogical-op",
@@ -27,8 +26,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -39,6 +38,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-mno-movbe",
"-Wclobbered",
"-Wno-psabi",
@@ -74,8 +74,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -86,6 +86,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -114,8 +115,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -126,6 +127,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -154,8 +156,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -166,6 +168,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -194,8 +197,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -206,6 +209,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -234,8 +238,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -246,6 +250,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -274,8 +279,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -286,6 +291,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 89e4c6f3..4f14ab26 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -32,8 +32,8 @@
"-resource-dir=someResourceDir",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -44,6 +44,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -57,8 +58,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -69,6 +70,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -112,8 +114,8 @@
"-resource-dir=someResourceDir",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -124,6 +126,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -137,8 +140,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -149,6 +152,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -194,8 +198,8 @@
"-resource-dir=someResourceDir",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -206,6 +210,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -222,8 +227,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -234,6 +239,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -280,8 +286,8 @@
"-resource-dir=someResourceDir",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -292,6 +298,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -305,8 +312,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -317,6 +324,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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..f88174a7 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,8 +19,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -31,6 +31,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -60,8 +61,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -72,6 +73,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -87,8 +89,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -99,6 +101,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -132,8 +135,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -144,6 +147,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -159,8 +163,8 @@
"args": [
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
"-fuse-ld=lld",
+ "-fdebug-default-version=5",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wno-tautological-constant-compare",
@@ -171,6 +175,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_host_wrapper.json b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_host_wrapper.json
index 62afbbaa..825e5dd3 100644
--- a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_host_wrapper.json
+++ b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_host_wrapper.json
@@ -17,6 +17,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
diff --git a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json
index 6c88c344..97fb19b0 100644
--- a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_maincc_target_specific.json
@@ -17,6 +17,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -41,6 +42,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -65,6 +67,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -89,6 +92,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -113,6 +117,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -137,6 +142,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -161,6 +167,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -185,6 +192,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -209,6 +217,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
diff --git a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_path.json b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_path.json
index b846d47f..c71bcd44 100644
--- a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_path.json
@@ -17,6 +17,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -44,6 +45,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
},
@@ -71,6 +73,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -95,6 +98,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -119,6 +123,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
@@ -146,6 +151,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"main.cc"
]
}
diff --git a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_specific_args.json
index e1470474..cd656307 100644
--- a/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_gcc_host_golden/gcc_specific_args.json
@@ -18,6 +18,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"-march=goldmont",
"main.cc"
]
@@ -44,6 +45,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"-march=goldmont-plus",
"main.cc"
]
@@ -70,6 +72,7 @@
"-Wno-maybe-uninitialized",
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
+ "-fcommon",
"-march=skylake",
"main.cc"
]
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index b8e0e462..53cc5986 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -28,7 +28,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -40,11 +40,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -94,7 +96,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -106,11 +108,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -163,7 +167,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -175,11 +179,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 13e97dc0..c7016ad1 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
@@ -19,7 +19,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -31,11 +31,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -75,7 +77,7 @@
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -87,11 +89,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -131,7 +135,7 @@
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -143,11 +147,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -187,7 +193,7 @@
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -199,11 +205,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -242,7 +250,7 @@
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -254,11 +262,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/armv7m-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -297,7 +307,7 @@
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -309,11 +319,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -352,7 +364,7 @@
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -364,11 +376,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -407,7 +421,7 @@
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -419,11 +433,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/armv8m-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -462,7 +478,7 @@
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -474,11 +490,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 b604692a..4c7ebd05 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
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -72,7 +74,7 @@
"--sysroot=/usr/x86_64-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -84,11 +86,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -126,7 +130,7 @@
"--sysroot=/usr/x86_64-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -138,11 +142,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -180,7 +186,7 @@
"--sysroot=/usr/armv7m-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -192,11 +198,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -233,7 +241,7 @@
"--sysroot=/usr/armv7m-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -245,11 +253,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/armv7m-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -286,7 +296,7 @@
"--sysroot=/usr/armv7m-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -298,11 +308,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -339,7 +351,7 @@
"--sysroot=/usr/armv8m-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -351,11 +363,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -392,7 +406,7 @@
"--sysroot=/usr/armv8m-cros-eabi",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -404,11 +418,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/armv8m-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -445,7 +461,7 @@
"--sysroot=/usr/armv8m-cros-win-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -457,11 +473,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index 9780356e..48ab0dd9 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -75,7 +77,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -87,11 +89,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -132,7 +136,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -144,11 +148,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -189,7 +195,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -201,11 +207,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -253,7 +261,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -265,11 +273,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -322,7 +332,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -334,11 +344,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -386,7 +398,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -398,11 +410,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -445,7 +459,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -457,11 +471,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -499,7 +515,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -511,11 +527,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -553,7 +571,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -565,11 +583,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -607,7 +627,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -619,11 +639,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -664,7 +686,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -676,11 +698,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 b90ad65d..30536e68 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -20,7 +20,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -32,10 +32,12 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -76,7 +78,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -88,10 +90,12 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -132,7 +136,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -144,10 +148,12 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -188,7 +194,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -200,10 +206,12 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -243,7 +251,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -255,11 +263,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
"-fno-experimental-new-pass-manager",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=fuzzer",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -300,7 +310,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -312,11 +322,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
"-fno-experimental-new-pass-manager",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
@@ -357,7 +369,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -369,10 +381,12 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -412,7 +426,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -424,11 +438,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 0d4aaf92..973cf630 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -6,7 +6,6 @@
"path": "./x86_64-cros-linux-gnu-clang",
"args": [
"-mno-movbe",
- "-pass-exit-codes",
"-Wclobbered",
"-Wno-psabi",
"-Wlogical-op",
@@ -29,7 +28,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -41,11 +40,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-mno-movbe",
"-Wclobbered",
"-Wno-psabi",
@@ -92,7 +93,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -104,11 +105,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -148,7 +151,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -160,11 +163,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -204,7 +209,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -216,11 +221,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -260,7 +267,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -272,11 +279,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -316,7 +325,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -328,11 +337,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -372,7 +383,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -384,11 +395,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 0ef55357..f9fa152a 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
@@ -19,6 +19,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -53,7 +54,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -65,11 +66,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -110,7 +113,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -122,11 +125,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -160,7 +165,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -172,9 +177,11 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -213,7 +220,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -225,9 +232,11 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-fno-stack-protector",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -267,7 +276,7 @@
"--sysroot=/usr/armv7a-cros-linux-gnueabihf",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -279,9 +288,11 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
"-fno-stack-protector",
+ "--prefix=../../bin/armv7a-cros-linux-gnueabihf-",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -319,7 +330,7 @@
"../../usr/bin/clang",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -331,11 +342,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"--sysroot=xyz",
"main.cc",
"-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index 06e114cb..d2f22710 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -33,7 +33,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -45,11 +45,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -68,7 +70,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -80,11 +82,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -133,7 +137,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -145,11 +149,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -169,7 +175,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -181,11 +187,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -236,7 +244,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -248,11 +256,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -275,7 +285,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -287,11 +297,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -343,7 +355,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -355,11 +367,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -379,7 +393,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -391,11 +405,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 cd460a79..523d3df4 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -21,7 +21,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -33,11 +33,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -78,7 +80,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -90,11 +92,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -121,7 +125,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -133,11 +137,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -182,7 +188,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -194,11 +200,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -225,7 +233,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -237,11 +245,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 c7f619d9..f3d487ee 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -57,6 +59,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -96,7 +99,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -108,11 +111,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -135,6 +140,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -169,7 +175,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -181,11 +187,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -226,7 +234,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -238,11 +246,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -265,6 +275,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
index a45c95f1..7affa691 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_maincc_target_specific.json
@@ -19,6 +19,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -55,6 +56,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -91,6 +93,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -127,6 +130,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -162,6 +166,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -197,6 +202,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -232,6 +238,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -267,6 +274,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -302,6 +310,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
index 36bf222b..c32ef3b8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json
@@ -19,6 +19,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -58,6 +59,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -97,6 +99,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -133,6 +136,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -169,6 +173,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -208,6 +213,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
index 3807d8ab..380665f8 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json
@@ -21,6 +21,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -60,6 +61,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -99,6 +101,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -138,6 +141,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -176,6 +180,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -215,6 +220,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -254,6 +260,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -292,6 +299,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
index e8a57b2f..bade6d95 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json
@@ -20,12 +20,13 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
- "-march=silvermont",
+ "-march=goldmont",
"main.cc",
"-mno-movbe"
],
@@ -58,12 +59,13 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
- "-march=silvermont",
+ "-march=goldmont-plus",
"main.cc",
"-mno-movbe"
],
@@ -96,12 +98,13 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
- "-march=corei7",
+ "-march=skylake",
"main.cc",
"-mno-movbe"
],
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
index d17707a8..11d58f55 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sysroot_wrapper_common.json
@@ -19,6 +19,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -54,6 +55,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -93,6 +95,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -126,6 +129,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
@@ -161,6 +165,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
"-fno-stack-protector",
@@ -197,6 +202,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-D_FORTIFY_SOURCE=2",
"-mthumb",
"-fno-stack-protector",
@@ -231,6 +237,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index b8e0e462..53cc5986 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -28,7 +28,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -40,11 +40,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -94,7 +96,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -106,11 +108,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -163,7 +167,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -175,11 +179,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 9780356e..48ab0dd9 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -75,7 +77,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -87,11 +89,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -132,7 +136,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -144,11 +148,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -189,7 +195,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -201,11 +207,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -253,7 +261,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -265,11 +273,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -322,7 +332,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -334,11 +344,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -386,7 +398,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -398,11 +410,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -445,7 +459,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -457,11 +471,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -499,7 +515,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -511,11 +527,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -553,7 +571,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -565,11 +583,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -607,7 +627,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -619,11 +639,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -664,7 +686,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -676,11 +698,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index 06e114cb..d2f22710 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -33,7 +33,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -45,11 +45,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -68,7 +70,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -80,11 +82,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -133,7 +137,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -145,11 +149,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -169,7 +175,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -181,11 +187,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -236,7 +244,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -248,11 +256,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -275,7 +285,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -287,11 +297,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -343,7 +355,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -355,11 +367,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -379,7 +393,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -391,11 +405,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 cd460a79..523d3df4 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
@@ -21,7 +21,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -33,11 +33,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -78,7 +80,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -90,11 +92,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -121,7 +125,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -133,11 +137,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -182,7 +188,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -194,11 +200,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -225,7 +233,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -237,11 +245,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 c7f619d9..f3d487ee 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
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -57,6 +59,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -96,7 +99,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -108,11 +111,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -135,6 +140,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -169,7 +175,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -181,11 +187,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -226,7 +234,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -238,11 +246,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -265,6 +275,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json
index 36bf222b..c32ef3b8 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json
@@ -19,6 +19,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -58,6 +59,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -97,6 +99,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -133,6 +136,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -169,6 +173,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -208,6 +213,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index b53bcc59..5adec383 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -27,7 +27,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -39,11 +39,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -89,7 +91,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -101,11 +103,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -154,7 +158,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -166,11 +170,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 9176e9d7..ff41cec6 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -17,7 +17,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -29,11 +29,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -68,7 +70,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -80,11 +82,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -119,7 +123,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -131,11 +135,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -170,7 +176,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -182,11 +188,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -228,7 +236,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -240,11 +248,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -292,7 +302,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -304,11 +314,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -355,7 +367,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -367,11 +379,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -408,7 +422,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -420,11 +434,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -456,7 +472,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -468,11 +484,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -504,7 +522,7 @@
"--sysroot=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -516,11 +534,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -552,7 +572,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -564,11 +584,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -603,7 +625,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -615,11 +637,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index 06e114cb..d2f22710 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -33,7 +33,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -45,11 +45,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -68,7 +70,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -80,11 +82,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -133,7 +137,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -145,11 +149,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -169,7 +175,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -181,11 +187,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -236,7 +244,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -248,11 +256,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -275,7 +285,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -287,11 +297,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -343,7 +355,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -355,11 +367,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -379,7 +393,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -391,11 +405,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 a85e91ee..46a56fa4 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
@@ -20,7 +20,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -32,11 +32,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -71,7 +73,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -83,11 +85,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -108,7 +112,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -120,11 +124,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -163,7 +169,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -175,11 +181,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -200,7 +208,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -212,11 +220,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 fe1e9b35..0c937f26 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
@@ -18,7 +18,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -30,11 +30,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -56,6 +58,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -91,7 +94,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -103,11 +106,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -130,6 +135,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -164,7 +170,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -176,11 +182,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -221,7 +229,7 @@
"--sysroot=/usr/x86_64-cros-linux-gnu",
"-Qunused-arguments",
"-fno-addrsig",
- "-fcommon",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -233,11 +241,13 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
"-D_FORTIFY_SOURCE=2",
"-fno-omit-frame-pointer",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -259,6 +269,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
index 694b921a..6bd35ffa 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_path.json
@@ -18,6 +18,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -52,6 +53,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -86,6 +88,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -117,6 +120,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -148,6 +152,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
@@ -182,6 +187,7 @@
"-fno-reorder-blocks-and-partition",
"-Wno-unused-local-typedefs",
"-Wno-maybe-uninitialized",
+ "-fcommon",
"-fstack-protector-strong",
"-fPIE",
"-pie",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
index b7e4de39..91ed0d69 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json
@@ -27,6 +27,7 @@
"../../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",
@@ -37,6 +38,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -85,6 +87,7 @@
"../../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",
@@ -95,6 +98,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -146,6 +150,7 @@
"../../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",
@@ -156,6 +161,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 a9e8b859..2793238d 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,6 +18,7 @@
"../../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",
@@ -28,6 +29,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -66,6 +68,7 @@
"../../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",
@@ -76,6 +79,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -114,6 +118,7 @@
"../../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",
@@ -124,6 +129,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -162,6 +168,7 @@
"../../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",
@@ -173,6 +180,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -210,6 +218,7 @@
"../../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",
@@ -220,6 +229,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/armv7m-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -257,6 +267,7 @@
"../../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",
@@ -268,6 +279,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -305,6 +317,7 @@
"../../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",
@@ -316,6 +329,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-linux-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -353,6 +367,7 @@
"../../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",
@@ -363,6 +378,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/armv8m-cros-eabi-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -400,6 +416,7 @@
"../../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",
@@ -411,6 +428,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-win-gnu-",
"-ftrapv",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 bedbd6eb..183ed65a 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,6 +17,7 @@
"../../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",
@@ -27,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -63,6 +65,7 @@
"../../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",
@@ -73,6 +76,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -109,6 +113,7 @@
"../../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",
@@ -119,6 +124,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -155,6 +161,7 @@
"../../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",
@@ -166,6 +173,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -201,6 +209,7 @@
"../../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",
@@ -211,6 +220,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/armv7m-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -246,6 +256,7 @@
"../../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",
@@ -257,6 +268,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv7m-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -292,6 +304,7 @@
"../../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",
@@ -303,6 +316,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -338,6 +352,7 @@
"../../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",
@@ -348,6 +363,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/armv8m-cros-eabi-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -383,6 +399,7 @@
"../../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",
@@ -394,6 +411,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
+ "--prefix=../../bin/armv8m-cros-win-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
index edd40b72..9a7ef5a0 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json
@@ -17,6 +17,7 @@
"../../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",
@@ -27,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -66,6 +68,7 @@
"../../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",
@@ -76,6 +79,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -115,6 +119,7 @@
"../../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",
@@ -125,6 +130,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -164,6 +170,7 @@
"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",
@@ -174,6 +181,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -220,6 +228,7 @@
"/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",
@@ -230,6 +239,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -281,6 +291,7 @@
"/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",
@@ -291,6 +302,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -337,6 +349,7 @@
"/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",
@@ -347,6 +360,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-resource-dir=someResourceDir",
"--gcc-toolchain=/usr",
"main.cc",
@@ -388,6 +402,7 @@
"/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",
@@ -398,6 +413,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -434,6 +450,7 @@
"a/b/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/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",
@@ -444,6 +461,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -480,6 +498,7 @@
"a/b/usr/bin/clang",
"--sysroot=/tmp/stable/a/b/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",
@@ -490,6 +509,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=a/b/bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -526,6 +546,7 @@
"../../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",
@@ -536,6 +557,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -575,6 +597,7 @@
"/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",
@@ -585,6 +608,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 e10a92b9..26029d5e 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json
@@ -19,6 +19,7 @@
"../../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",
@@ -29,6 +30,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -68,6 +70,7 @@
"../../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",
@@ -78,6 +81,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -117,6 +121,7 @@
"../../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",
@@ -127,6 +132,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -166,6 +172,7 @@
"../../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",
@@ -176,6 +183,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=kernel-address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -214,6 +222,7 @@
"../../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",
@@ -225,6 +234,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=fuzzer",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -264,6 +274,7 @@
"../../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",
@@ -275,6 +286,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-experimental-new-pass-manager",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"-fprofile-instr-generate",
"main.cc",
@@ -314,6 +326,7 @@
"../../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",
@@ -324,6 +337,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fsanitize=address",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -362,6 +376,7 @@
"../../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",
@@ -372,6 +387,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-fprofile-instr-generate",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 aafdaba0..256078cb 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json
@@ -6,7 +6,6 @@
"path": "./x86_64-cros-linux-gnu-clang",
"args": [
"-mno-movbe",
- "-pass-exit-codes",
"-Wclobbered",
"-Wno-psabi",
"-Wlogical-op",
@@ -28,6 +27,7 @@
"../../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",
@@ -38,6 +38,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-mno-movbe",
"-Wclobbered",
"-Wno-psabi",
@@ -83,6 +84,7 @@
"../../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",
@@ -93,6 +95,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-#warnings",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -131,6 +134,7 @@
"../../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",
@@ -141,6 +145,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=uninitialized",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -179,6 +184,7 @@
"../../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",
@@ -189,6 +195,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-error=unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -227,6 +234,7 @@
"../../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",
@@ -237,6 +245,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wno-unused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -275,6 +284,7 @@
"../../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",
@@ -285,6 +295,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-Wunused-variable",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -323,6 +334,7 @@
"../../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",
@@ -333,6 +345,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-someflag",
"main.cc",
"-Wno-implicit-int-float-conversion",
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 e094f911..2e8bffed 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
@@ -48,6 +48,7 @@
"../../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",
@@ -58,6 +59,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -97,6 +99,7 @@
"../../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",
@@ -107,6 +110,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -139,6 +143,7 @@
"../../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",
@@ -149,6 +154,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -186,6 +192,7 @@
"../../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",
@@ -197,6 +204,7 @@
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-fno-stack-protector",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -235,6 +243,7 @@
"../../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",
@@ -247,6 +256,7 @@
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
"-mthumb",
"-fno-stack-protector",
+ "--prefix=../../bin/armv7a-cros-linux-gnueabihf-",
"-D__KERNEL__",
"main.cc",
"-Wno-implicit-int-float-conversion",
@@ -283,6 +293,7 @@
"args": [
"../../usr/bin/clang",
"-Qunused-arguments",
+ "-fdebug-default-version=5",
"-Wno-tautological-constant-compare",
"-Wno-tautological-unsigned-enum-zero-compare",
"-Wno-unknown-warning-option",
@@ -293,6 +304,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"--sysroot=xyz",
"main.cc",
"-Wno-implicit-int-float-conversion",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
index 4e6ec630..53bfbde2 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clangtidy.json
@@ -32,6 +32,7 @@
"-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",
@@ -42,6 +43,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -59,6 +61,7 @@
"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",
@@ -69,6 +72,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -116,6 +120,7 @@
"-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",
@@ -126,6 +131,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -144,6 +150,7 @@
"../../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",
@@ -154,6 +161,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -203,6 +211,7 @@
"-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",
@@ -213,6 +222,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -234,6 +244,7 @@
"../../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",
@@ -244,6 +255,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -294,6 +306,7 @@
"-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",
@@ -304,6 +317,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -322,6 +336,7 @@
"../../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",
@@ -332,6 +347,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 ef266efa..1bf6339f 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json
@@ -20,6 +20,7 @@
"../../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",
@@ -30,6 +31,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -69,6 +71,7 @@
"../../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",
@@ -79,6 +82,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -104,6 +108,7 @@
"../../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",
@@ -114,6 +119,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -157,6 +163,7 @@
"../../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",
@@ -167,6 +174,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -192,6 +200,7 @@
"../../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",
@@ -202,6 +211,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
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 9ea1c01d..ca3284f5 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json
@@ -17,6 +17,7 @@
"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",
@@ -27,6 +28,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -83,6 +85,7 @@
"../../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",
@@ -93,6 +96,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -144,6 +148,7 @@
"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",
@@ -154,6 +159,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
@@ -193,6 +199,7 @@
"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",
@@ -203,6 +210,7 @@
"-fexperimental-new-pass-manager",
"-Wno-compound-token-split-by-macro",
"-fcrash-diagnostics-dir=/tmp/stable/clang_crash_diagnostics",
+ "--prefix=../../bin/x86_64-cros-linux-gnu-",
"main.cc",
"-Wno-implicit-int-float-conversion",
"-Wno-compound-token-split-by-space",
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
index c2f7cd07..dc9bdbe0 100644
--- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
+++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json
@@ -21,7 +21,7 @@
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wtrampolines",
- "-march=silvermont",
+ "-march=goldmont",
"main.cc",
"-mno-movbe"
],
@@ -55,7 +55,7 @@
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wtrampolines",
- "-march=silvermont",
+ "-march=goldmont-plus",
"main.cc",
"-mno-movbe"
],
@@ -89,7 +89,7 @@
"-Wno-unused-local-typedefs",
"-Wno-deprecated-declarations",
"-Wtrampolines",
- "-march=corei7",
+ "-march=skylake",
"main.cc",
"-mno-movbe"
],