compiler_wrapper: Add "-fcommon" to clang invocations

Clang ToT has switched to "-fno-common" as default to match GCC 10 which
breaks many packages. Upgrading to ToT versions of many packages does not
fix the problem as packages upstream have not fixed them yet.
Pass "-fcommon" in compiler wrapper to workaround this for now.
This does not change the current clang behavior which defaults to
"-fcommon" so this is a NFC.

BUG=chromium:1060413
TEST=packages build with ToT clang; NFC for current clang

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

29 files changed, 197 insertions, 0 deletions

diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
index e29d77e0..606fecda 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json
@@ -27,6 +27,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -74,6 +75,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -124,6 +126,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 5036312d..7f45584a 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
@@ -18,6 +18,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -52,6 +53,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -86,6 +88,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -120,6 +123,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -154,6 +158,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -188,6 +193,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -222,6 +228,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -256,6 +263,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -290,6 +298,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 6e897172..afb0329e 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
@@ -17,6 +17,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 ab3ce44c..05b0ff96 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
@@ -17,6 +17,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -50,6 +51,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -83,6 +85,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -116,6 +119,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -149,6 +153,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -182,6 +187,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -215,6 +221,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -248,6 +255,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -281,6 +289,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 b2de2870..f7924a06 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json
@@ -17,6 +17,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -53,6 +54,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -89,6 +91,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -125,6 +128,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -168,6 +172,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -216,6 +221,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -264,6 +270,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -302,6 +309,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -335,6 +343,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -368,6 +377,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -401,6 +411,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -437,6 +448,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 fff7d0fd..11ebc821 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
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -55,6 +56,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -91,6 +93,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -127,6 +130,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -162,6 +166,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -199,6 +204,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -236,6 +242,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -271,6 +278,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 568ab6eb..7a724c88 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
@@ -28,6 +28,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -62,6 +63,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -97,6 +99,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -132,6 +135,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -167,6 +171,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -202,6 +207,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -237,6 +243,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
index 43f02b45..b4cd44c2 100644
--- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json
@@ -33,6 +33,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -53,6 +54,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -103,6 +105,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -123,6 +126,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -175,6 +179,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -198,6 +203,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -251,6 +257,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -271,6 +278,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
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 f1de9518..66e58dc9 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
@@ -20,6 +20,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -56,6 +57,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -78,6 +80,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -118,6 +121,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
@@ -140,6 +144,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-fuse-ld=lld",
             "-Wno-unused-local-typedefs",
             "-Wno-deprecated-declarations",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
index aa9d3853..b99fadc2 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json
@@ -29,6 +29,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -90,6 +91,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -154,6 +156,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 3e4cb4bc..e10ef91e 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
@@ -20,6 +20,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -71,6 +72,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -122,6 +124,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -173,6 +176,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -224,6 +228,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -275,6 +280,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -326,6 +332,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -377,6 +384,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -428,6 +436,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 8ba250d6..72649957 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
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -68,6 +69,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -117,6 +119,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -166,6 +169,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -215,6 +219,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -264,6 +269,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -313,6 +319,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -362,6 +369,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -411,6 +419,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
index abf34e8b..9cfd24d7 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -71,6 +72,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -123,6 +125,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -175,6 +178,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -234,6 +238,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -298,6 +303,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -356,6 +362,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -410,6 +417,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -459,6 +467,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -508,6 +517,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -557,6 +567,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -609,6 +620,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 8ce50182..5e8b21a9 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json
@@ -21,6 +21,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -72,6 +73,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -123,6 +125,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -174,6 +177,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -224,6 +228,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -276,6 +281,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -328,6 +334,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -378,6 +385,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 eb12523b..ee7a73fe 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json
@@ -30,6 +30,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -80,6 +81,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -131,6 +133,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -182,6 +185,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -233,6 +237,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -284,6 +289,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -335,6 +341,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 5ea9e300..485e6230 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
@@ -54,6 +54,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -106,6 +107,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -150,6 +152,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -198,6 +201,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -247,6 +251,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -295,6 +300,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
index dcaed1e5..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json
@@ -34,6 +34,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -63,6 +64,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -122,6 +124,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -152,6 +155,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -213,6 +217,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -246,6 +251,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -308,6 +314,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -338,6 +345,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 87befee3..9559e199 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json
@@ -22,6 +22,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -74,6 +75,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -112,6 +114,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -168,6 +171,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -206,6 +210,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 dd0a4f4d..3c4937b3 100644
--- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
+++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -92,6 +93,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -159,6 +161,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -210,6 +213,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
index aa9d3853..b99fadc2 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json
@@ -29,6 +29,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -90,6 +91,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -154,6 +156,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 abf34e8b..9cfd24d7 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -71,6 +72,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -123,6 +125,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -175,6 +178,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -234,6 +238,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -298,6 +303,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -356,6 +362,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -410,6 +417,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -459,6 +467,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -508,6 +517,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -557,6 +567,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -609,6 +620,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
index dcaed1e5..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json
@@ -34,6 +34,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -63,6 +64,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -122,6 +124,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -152,6 +155,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -213,6 +217,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -246,6 +251,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -308,6 +314,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -338,6 +345,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 87befee3..9559e199 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
@@ -22,6 +22,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -74,6 +75,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -112,6 +114,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -168,6 +171,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -206,6 +210,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 dd0a4f4d..3c4937b3 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
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -92,6 +93,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -159,6 +161,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -210,6 +213,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
index ca2eda8a..e9bc3661 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json
@@ -28,6 +28,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -84,6 +85,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -143,6 +145,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 73da7082..c21d6198 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json
@@ -18,6 +18,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -63,6 +64,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -108,6 +110,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -153,6 +156,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -205,6 +209,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -263,6 +268,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -320,6 +326,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -367,6 +374,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -409,6 +417,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -451,6 +460,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -493,6 +503,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -538,6 +549,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
index dcaed1e5..26abab87 100644
--- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
+++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json
@@ -34,6 +34,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -63,6 +64,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -122,6 +124,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -152,6 +155,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -213,6 +217,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -246,6 +251,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -308,6 +314,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -338,6 +345,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 5ff4c32d..ce35f311 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
@@ -21,6 +21,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -66,6 +67,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -97,6 +99,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -146,6 +149,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -177,6 +181,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
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 179d660f..f716dde3 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
@@ -19,6 +19,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -86,6 +87,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -153,6 +155,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",
@@ -204,6 +207,7 @@
             "-Qunused-arguments",
             "-grecord-gcc-switches",
             "-fno-addrsig",
+            "-fcommon",
             "-Wno-tautological-constant-compare",
             "-Wno-tautological-unsigned-enum-zero-compare",
             "-Wno-unknown-warning-option",