Merging 63 commit(s) from Chromium's toolchain-utils

Merged commit digest:
  3ae4421 afdo_tools: Improve update_kernel_afdo script
  bc16e2f llvm_tool: make either --sha or --differential required.
  d8f8736 afdo_metadata: Publish the new kernel profiles
  fd0b18e llvm_tool: support differential reviews in the cherry-pick tool.
  6fed0d0 crosperf: update default remotes
  203e739 afdo_metadata: Publish the new kernel profiles
  d6e464f compiler_wrapper: remove LD_ARGV0 flag
  d773afd afdo_metadata: Publish the new kernel profiles
  2a0c294 default_remotes: update the list of machines
  4a12a12 llvm_tools: refactor automatic LLVM bisection
  b5bce20 llvm_tools: fix LLVM bisection tool.
  cc6e72a compiler_wrapper: disable rusage when goma enabled
  1f5fbfa compiler_wrapper: remove useless gomaEnabled var
  307e66c android_bench_suite: remove
  c4c44a5 afdo_metadata: Publish the new kernel profiles
  53e9fbe replaces skylab with crosfleet
  529f456 PRESUBMIT.cfg: drop --py3 to cros lint
  054e7e5 toolchain-utils: New script to make / on chromebook writable.
  a2c555d bisection: support hostname:port form device in kernel bisection
  7383470 afdo_metadata: Publish the new kernel profiles
  ed23535 compiler_wrapper: reenable goma w/ rusage
  e62cc7d afdo_metadata: Publish the new kernel profiles
  859aa63 afdo: Add 5.4 into kernel afdo metadata
  52a1c9d nightly_revert_checker: update branch name
  0833f0c afdo_metadata: Update kernel profiles
  efdffcc toolchain-utils: compiler_wrapper: Update instructions
  e3a5ad9 afdo_metadata: Publish the new kernel profiles
  412cb5e compiler_wrapper: pass --prefix argument to clang
  720f951 toolchain-utils: Update our kefka machines.
  72e0092 compiler_wrapper: gofmt gcc_flags.go
  7c59ee0 compiler_wrapper: disable goma, ccache w/ rusage
  2e0f7c6 fixes failure when a commit has already been cherry-picked
  3645b98 afdo_metadata: Publish the new kernel profiles
  f5dbbbe adds cherry-picking to the nightly revert checker
  21929ca gcc: Remove deprecated conversions
  1f5d695 gcc: Map Alderlake to Skylake
  3dd52af toolchain-utils: Make DWARF v5 the default.
  82cde0c kernel_afdo.json: Update to R90-13754.0-1612175977
  7ed03fe compiler_wrapper: make a loop c89-compatible
  235f72a compiler_wrapper: add go.mod
  1ac4f76 compiler_wrapper: add a script to restore us to a working wrapper
  d4d6eb9 compiler_wrapper: Remove "-m32/movbe" from i686 handling
  cbc852e compiler_wrapper: work around gcc failing due to a kernel bug
  8126715 compiler_wrapper: disable force-disable-werror with GCC
  77a0c20 compiler_wrapper: loop in exec on ERESTARTSYS
  de5be16 compiler_wrapper: fix a bug where we won't log rusage on compilation
  efefb1a compiler_wrapper: Fix gcc host wrapper config
  2844e62 llvm_tools: make the lexan 4c uploader ignore old clang(s)
  92fff66 compiler_wrapper: Add "-fcommon" to GCC
  7ee49e4 compiler_wrapper: refactor rusage_flag
  2257714 llvm_tools: Fix bisection with main branch
  a58bd46 compiler_wrapper: add working dir to rusage logs
  6f559ce kernel_afdo.json: Update to R89-13710.0
  d4821af crosperf: Fix index incrementing
  9f99f6c rust_uprev: also uprev rust-bootstrap
  d828420 afdo_metadata: Publish the new kernel profiles
  98b1224 compiler_wrapper: remove "-pass-exit-codes" in wrapper
  63b249a afdo_metadata: Publish the new kernel profiles
  58a786a compiler_wrapper: Fix rusage_flag permission error
  a27756b rust_uprev: accept -r* in virtual/rust version numbers
  bcda475 rust_uprev: mark test_success_with_template mock_find_ebuild unused
  2d837f0 compiler_wrapper: rename GETRUSAGE flag
  914431e compiler_wrapper: make rusage logs json

Change-Id: Ifa84609958eeae56d19c1302f8fcdeaa82c23dad

70 files changed, 1317 insertions, 395 deletions

diff --git a/compiler_wrapper/README.md b/compiler_wrapper/README.md
index e55bb669..12ae3131 100644
--- a/compiler_wrapper/README.md
+++ b/compiler_wrapper/README.md
@@ -44,18 +44,10 @@ revision number. For example, if the current version is
 ```
 
 Rename chromiumos-overlay/sys-devel/gcc/gcc-${VERSION}.ebuild to the next
-revision number.  For example, if the current version is 4.9.2-r254:
+revision number.  For example, if the current version is 10.2.0-r3:
 ```
 (chroot) cd ~/trunk/src/third_party/chromiumos-overlay
-(chroot) git mv sys-devel/gcc/gcc-4.9.2-r254.ebuild sys-devel/gcc/gcc-4.9.2-r255.ebuild
-```
-
-Edit the new ebuild file and change the number at the end to match the new revision:
-```
--# If you need to force a cros_workon uprev, change this number (you can use next
--# uprev): 254
-+# If you need to force a cros_workon uprev, change this number (you can use next
-+# uprev): 255
+(chroot) git mv sys-devel/gcc/gcc-10.2.0-r3.ebuild sys-devel/gcc/gcc-10.2.0-r4.ebuild
 ```
 
 Commit those changes together with the changes made by
@@ -74,10 +66,10 @@ The changes can then be reviewed and submitted through the normal process.
 Generated wrappers are stored here:
 
 - Sysroot wrapper with ccache:
-  `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot_wrapper.hardened.ccache`
+  `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/10.2.0/sysroot_wrapper.hardened.ccache`
 - Sysroot wrapper without ccache:
-  `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/4.9.x/sysroot_wrapper.hardened.noccache`
+  `/usr/x86_64-pc-linux-gnu/<arch>/gcc-bin/10.2.0/sysroot_wrapper.hardened.noccache`
 - Clang host wrapper:
   `/usr/bin/clang_host_wrapper`
 - Gcc host wrapper:
-  `/usr/x86_64-pc-linux-gnu/gcc-bin/4.9.x/host_wrapper`
+  `/usr/x86_64-pc-linux-gnu/gcc-bin/10.2.0/host_wrapper`
diff --git a/compiler_wrapper/ccache_flag_test.go b/compiler_wrapper/ccache_flag_test.go
index 03a74de8..2b18c8ca 100644
--- a/compiler_wrapper/ccache_flag_test.go
+++ b/compiler_wrapper/ccache_flag_test.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"path/filepath"
 	"testing"
 )
 
@@ -160,3 +161,14 @@ func withCCacheEnabledTestContext(t *testing.T, work func(ctx *testContext)) {
 		work(ctx)
 	})
 }
+
+func TestRusagePreventsCCache(t *testing.T) {
+	withCCacheEnabledTestContext(t, func(ctx *testContext) {
+		ctx.env = append(ctx.env, "TOOLCHAIN_RUSAGE_OUTPUT="+filepath.Join(ctx.tempDir, "rusage.log"))
+		cmd := ctx.must(callCompiler(ctx, ctx.cfg,
+			ctx.newCommand(gccX86_64, mainCc)))
+		if err := verifyPath(cmd, gccX86_64+".real"); err != nil {
+			t.Error(err)
+		}
+	})
+}
diff --git a/compiler_wrapper/clang_flags.go b/compiler_wrapper/clang_flags.go
index 9eb951de..c69d1b3d 100644
--- a/compiler_wrapper/clang_flags.go
+++ b/compiler_wrapper/clang_flags.go
@@ -7,6 +7,7 @@ package main
 import (
 	"bytes"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -46,9 +47,7 @@ func processClangFlags(builder *commandBuilder) error {
 	//
 	// Use of -Qunused-arguments allows this set to be small, just those
 	// that clang still warns about.
-	unsupported := map[string]bool{
-		"-pass-exit-codes": true,
-	}
+	unsupported := make(map[string]bool)
 
 	unsupportedPrefixes := []string{"-Wstrict-aliasing=", "-finline-limit="}
 
@@ -136,19 +135,10 @@ func processClangFlags(builder *commandBuilder) error {
 			return wrapErrorwithSourceLocf(err, "failed to make linker path %s relative to %s",
 				linkerPath, env.getwd())
 		}
+		prefixPath := path.Join(relLinkerPath, builder.target.target+"-")
+		builder.addPreUserArgs("--prefix=" + prefixPath)
 		builder.addPostUserArgs("-B" + relLinkerPath)
-		if startswithI86(builder.target.arch) {
-			// TODO: -target i686-pc-linux-gnu causes clang to search for
-			// libclang_rt.asan-i686.a which doesn't exist because it's packaged
-			// as libclang_rt.asan-i386.a. We can't use -target i386-pc-linux-gnu
-			// because then it would try to run i386-pc-linux-gnu-ld which doesn't
-			// exist. Consider renaming the runtime library to use i686 in its name.
-			builder.addPostUserArgs("-m32")
-			// clang does not support -mno-movbe. This is the alternate way to do it.
-			builder.addPostUserArgs("-Xclang", "-target-feature", "-Xclang", "-movbe")
-		} else {
-			builder.addPostUserArgs("-target", builder.target.target)
-		}
+		builder.addPostUserArgs("-target", builder.target.target)
 	}
 	return nil
 }
diff --git a/compiler_wrapper/clang_flags_test.go b/compiler_wrapper/clang_flags_test.go
index a4145c22..bdc0bbaa 100644
--- a/compiler_wrapper/clang_flags_test.go
+++ b/compiler_wrapper/clang_flags_test.go
@@ -211,7 +211,6 @@ func TestFilterUnsupportedClangFlags(t *testing.T) {
 			flag          string
 			expectedCount int
 		}{
-			{clangX86_64, "-pass-exit-codes", 0},
 			{clangX86_64, "-Wstrict-aliasing=xyz", 0},
 			{clangX86_64, "-finline-limit=xyz", 0},
 			{"./armv7a-cros-linux-gnu-clang", "-ftrapv", 0},
@@ -236,7 +235,7 @@ func TestClangArchFlags(t *testing.T) {
 			compiler string
 			flags    []string
 		}{
-			{"./i686_64-cros-linux-gnu-clang", []string{mainCc, "-m32", "-Xclang", "-target-feature", "-Xclang", "-movbe"}},
+			{"./i686_64-cros-linux-gnu-clang", []string{mainCc, "-target", "i686_64-cros-linux-gnu"}},
 			{"./x86_64-cros-linux-gnu-clang", []string{mainCc, "-target", "x86_64-cros-linux-gnu"}},
 		}
 		for _, tt := range tests {
@@ -259,6 +258,10 @@ func TestClangLinkerPathProbesBinariesOnPath(t *testing.T) {
 		if err := verifyArgOrder(cmd, "-Ba/b/c"); err != nil {
 			t.Error(err)
 		}
+		if err := verifyArgOrder(cmd, "--prefix=a/b/c/x86_64-cros-linux-gnu-"); err != nil {
+			t.Error(err)
+		}
+
 	})
 }
 
@@ -277,6 +280,10 @@ func TestClangLinkerPathEvaluatesSymlinksForBinariesOnPath(t *testing.T) {
 		if err := verifyArgOrder(cmd, "-Ba/first"); err != nil {
 			t.Error(err)
 		}
+		if err := verifyArgOrder(cmd, "--prefix=a/first/x86_64-cros-linux-gnu-"); err != nil {
+			t.Error(err)
+		}
+
 	})
 }
 
@@ -287,6 +294,9 @@ func TestClangFallbackLinkerPathRelativeToRootDir(t *testing.T) {
 		if err := verifyArgOrder(cmd, "-Bbin"); err != nil {
 			t.Error(err)
 		}
+		if err := verifyArgOrder(cmd, "--prefix=bin/x86_64-cros-linux-gnu-"); err != nil {
+			t.Error(err)
+		}
 	})
 }
 
@@ -298,5 +308,8 @@ func TestClangLinkerPathRelativeToRootDir(t *testing.T) {
 		if err := verifyArgOrder(cmd, "-Bsomepath/bin"); err != nil {
 			t.Error(err)
 		}
+		if err := verifyArgOrder(cmd, "--prefix=somepath/bin/x86_64-cros-linux-gnu-"); err != nil {
+			t.Error(err)
+		}
 	})
 }
diff --git a/compiler_wrapper/command.go b/compiler_wrapper/command.go
index 69578597..e6ea6690 100644
--- a/compiler_wrapper/command.go
+++ b/compiler_wrapper/command.go
@@ -24,15 +24,8 @@ type command struct {
 }
 
 func newProcessCommand() *command {
-	// This is a workaround for the fact that ld.so does not support
-	// passing in the executable name when ld.so is invoked as
-	// an executable (crbug/1003841).
-	path := os.Getenv("LD_ARGV0")
-	if path == "" {
-		path = os.Args[0]
-	}
 	return &command{
-		Path: path,
+		Path: os.Args[0],
 		Args: os.Args[1:],
 	}
 }
diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go
index 2b9459e4..9d7b76e5 100644
--- a/compiler_wrapper/compiler_wrapper.go
+++ b/compiler_wrapper/compiler_wrapper.go
@@ -6,6 +6,7 @@ package main
 
 import (
 	"bytes"
+	"errors"
 	"fmt"
 	"io"
 	"path/filepath"
@@ -74,6 +75,15 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
 	env = mainBuilder.env
 	var compilerCmd *command
 	clangSyntax := processClangSyntaxFlag(mainBuilder)
+
+	rusageEnabled := isRusageEnabled(env)
+
+	// Disable CCache for rusage logs
+	// Note: Disabling Goma causes timeout related INFRA_FAILUREs in builders
+	allowCCache := !rusageEnabled
+	gomaUsed := false
+
+	workAroundKernelBugWithRetries := false
 	if cfg.isAndroidWrapper {
 		mainBuilder.path = calculateAndroidWrapperPath(mainBuilder.path, mainBuilder.absWrapperPath)
 		switch mainBuilder.target.compilerType {
@@ -81,7 +91,7 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
 			mainBuilder.addPreUserArgs(mainBuilder.cfg.clangFlags...)
 			mainBuilder.addPreUserArgs(mainBuilder.cfg.commonFlags...)
 			mainBuilder.addPostUserArgs(mainBuilder.cfg.clangPostFlags...)
-			if _, err := processGomaCccFlags(mainBuilder); err != nil {
+			if gomaUsed, err = processGomaCccFlags(mainBuilder); err != nil {
 				return 0, err
 			}
 			compilerCmd = mainBuilder.build()
@@ -97,7 +107,6 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
 			if err != nil {
 				return 0, err
 			}
-			allowCCache := true
 			if tidyMode != tidyModeNone {
 				allowCCache = false
 				clangCmdWithoutGomaAndCCache := mainBuilder.build()
@@ -118,64 +127,132 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int
 					return 0, err
 				}
 			}
-			if err := processGomaCCacheFlags(allowCCache, mainBuilder); err != nil {
+			if gomaUsed, err = processGomaCCacheFlags(allowCCache, mainBuilder); err != nil {
 				return 0, err
 			}
 			compilerCmd = mainBuilder.build()
 		} else {
 			if clangSyntax {
-				allowCCache := false
-				clangCmd, err := calcClangCommand(allowCCache, mainBuilder.clone())
+				allowCCache = false
+				_, clangCmd, err := calcClangCommand(allowCCache, mainBuilder.clone())
 				if err != nil {
 					return 0, err
 				}
-				gccCmd, err := calcGccCommand(mainBuilder)
+				_, gccCmd, err := calcGccCommand(rusageEnabled, mainBuilder)
 				if err != nil {
 					return 0, err
 				}
 				return checkClangSyntax(env, clangCmd, gccCmd)
 			}
-			compilerCmd, err = calcGccCommand(mainBuilder)
+			gomaUsed, compilerCmd, err = calcGccCommand(rusageEnabled, mainBuilder)
 			if err != nil {
 				return 0, err
 			}
+			workAroundKernelBugWithRetries = true
 		}
 	}
-	rusageLogfileName := getRusageLogFilename(env)
+
 	bisectStage := getBisectStage(env)
-	if shouldForceDisableWerror(env, cfg) {
-		if rusageLogfileName != "" {
-			return 0, newUserErrorf("GETRUSAGE is meaningless with FORCE_DISABLE_WERROR")
-		}
+
+	if rusageEnabled {
+		compilerCmd = removeRusageFromCommand(compilerCmd)
+	}
+
+	if shouldForceDisableWerror(env, cfg, mainBuilder.target.compilerType) {
 		if bisectStage != "" {
 			return 0, newUserErrorf("BISECT_STAGE is meaningless with FORCE_DISABLE_WERROR")
 		}
 		return doubleBuildWithWNoError(env, cfg, compilerCmd)
 	}
 	if shouldCompileWithFallback(env) {
-		if rusageLogfileName != "" {
-			return 0, newUserErrorf("GETRUSAGE is meaningless with FORCE_DISABLE_WERROR")
+		if rusageEnabled {
+			return 0, newUserErrorf("TOOLCHAIN_RUSAGE_OUTPUT is meaningless with ANDROID_LLVM_PREBUILT_COMPILER_PATH")
 		}
 		if bisectStage != "" {
-			return 0, newUserErrorf("BISECT_STAGE is meaningless with FORCE_DISABLE_WERROR")
+			return 0, newUserErrorf("BISECT_STAGE is meaningless with ANDROID_LLVM_PREBUILT_COMPILER_PATH")
 		}
 		return compileWithFallback(env, cfg, compilerCmd, mainBuilder.absWrapperPath)
 	}
-	if rusageLogfileName != "" {
-		if bisectStage != "" {
-			return 0, newUserErrorf("BISECT_STAGE is meaningless with GETRUSAGE")
-		}
-		return logRusage(env, rusageLogfileName, compilerCmd)
-	}
 	if bisectStage != "" {
+		if rusageEnabled {
+			return 0, newUserErrorf("TOOLCHAIN_RUSAGE_OUTPUT is meaningless with BISECT_STAGE")
+		}
 		compilerCmd, err = calcBisectCommand(env, cfg, bisectStage, compilerCmd)
 		if err != nil {
 			return 0, err
 		}
 	}
-	// Note: We return an exit code only if the underlying env is not
-	// really doing an exec, e.g. commandRecordingEnv.
-	return wrapSubprocessErrorWithSourceLoc(compilerCmd, env.exec(compilerCmd))
+
+	errRetryCompilation := errors.New("compilation retry requested")
+	var runCompiler func(willLogRusage bool) (int, error)
+	if !workAroundKernelBugWithRetries {
+		runCompiler = func(willLogRusage bool) (int, error) {
+			var err error
+			if willLogRusage {
+				err = env.run(compilerCmd, env.stdin(), env.stdout(), env.stderr())
+			} else {
+				// Note: We return from this in non-fatal circumstances only if the
+				// underlying env is not really doing an exec, e.g. commandRecordingEnv.
+				err = env.exec(compilerCmd)
+			}
+			return wrapSubprocessErrorWithSourceLoc(compilerCmd, err)
+		}
+	} else {
+		getStdin, err := prebufferStdinIfNeeded(env, compilerCmd)
+		if err != nil {
+			return 0, wrapErrorwithSourceLocf(err, "prebuffering stdin: %v", err)
+		}
+
+		stdoutBuffer := &bytes.Buffer{}
+		stderrBuffer := &bytes.Buffer{}
+		retryAttempt := 0
+		runCompiler = func(willLogRusage bool) (int, error) {
+			retryAttempt++
+			stdoutBuffer.Reset()
+			stderrBuffer.Reset()
+
+			exitCode, compilerErr := wrapSubprocessErrorWithSourceLoc(compilerCmd,
+				env.run(compilerCmd, getStdin(), stdoutBuffer, stderrBuffer))
+
+			if compilerErr != nil || exitCode != 0 {
+				if retryAttempt < kernelBugRetryLimit && (errorContainsTracesOfKernelBug(compilerErr) || containsTracesOfKernelBug(stdoutBuffer.Bytes()) || containsTracesOfKernelBug(stderrBuffer.Bytes())) {
+					return exitCode, errRetryCompilation
+				}
+			}
+			_, stdoutErr := stdoutBuffer.WriteTo(env.stdout())
+			_, stderrErr := stderrBuffer.WriteTo(env.stderr())
+			if stdoutErr != nil {
+				return exitCode, wrapErrorwithSourceLocf(err, "writing stdout: %v", stdoutErr)
+			}
+			if stderrErr != nil {
+				return exitCode, wrapErrorwithSourceLocf(err, "writing stderr: %v", stderrErr)
+			}
+			return exitCode, compilerErr
+		}
+	}
+
+	for {
+		var exitCode int
+		commitRusage, err := maybeCaptureRusage(env, compilerCmd, func(willLogRusage bool) error {
+			var err error
+			exitCode, err = runCompiler(willLogRusage)
+			return err
+		})
+
+		switch {
+		case err == errRetryCompilation:
+			// Loop around again.
+		case err != nil:
+			return exitCode, err
+		default:
+			if !gomaUsed {
+				if err := commitRusage(exitCode); err != nil {
+					return exitCode, fmt.Errorf("commiting rusage: %v", err)
+				}
+			}
+			return exitCode, err
+		}
+	}
 }
 
 func prepareClangCommand(builder *commandBuilder) (err error) {
@@ -191,33 +268,34 @@ func prepareClangCommand(builder *commandBuilder) (err error) {
 	return processClangFlags(builder)
 }
 
-func calcClangCommand(allowCCache bool, builder *commandBuilder) (*command, error) {
+func calcClangCommand(allowCCache bool, builder *commandBuilder) (bool, *command, error) {
 	err := prepareClangCommand(builder)
 	if err != nil {
-		return nil, err
+		return false, nil, err
 	}
-	if err := processGomaCCacheFlags(allowCCache, builder); err != nil {
-		return nil, err
+	gomaUsed, err := processGomaCCacheFlags(allowCCache, builder)
+	if err != nil {
+		return gomaUsed, nil, err
 	}
-	return builder.build(), nil
+	return gomaUsed, builder.build(), nil
 }
 
-func calcGccCommand(builder *commandBuilder) (*command, error) {
+func calcGccCommand(enableRusage bool, builder *commandBuilder) (bool, *command, error) {
 	if !builder.cfg.isHostWrapper {
 		processSysrootFlag(builder)
 	}
 	builder.addPreUserArgs(builder.cfg.gccFlags...)
-	if !builder.cfg.isHostWrapper {
-		calcCommonPreUserArgs(builder)
-	}
+	calcCommonPreUserArgs(builder)
 	processGccFlags(builder)
+
+	gomaUsed := false
 	if !builder.cfg.isHostWrapper {
-		allowCCache := true
-		if err := processGomaCCacheFlags(allowCCache, builder); err != nil {
-			return nil, err
+		var err error
+		if gomaUsed, err = processGomaCCacheFlags(!enableRusage, builder); err != nil {
+			return gomaUsed, nil, err
 		}
 	}
-	return builder.build(), nil
+	return gomaUsed, builder.build(), nil
 }
 
 func calcCommonPreUserArgs(builder *commandBuilder) {
@@ -231,18 +309,19 @@ func calcCommonPreUserArgs(builder *commandBuilder) {
 	processSanitizerFlags(builder)
 }
 
-func processGomaCCacheFlags(allowCCache bool, builder *commandBuilder) (err error) {
-	gomaccUsed := false
+func processGomaCCacheFlags(allowCCache bool, builder *commandBuilder) (gomaccUsed bool, err error) {
+
+	gomaccUsed = false
 	if !builder.cfg.isHostWrapper {
 		gomaccUsed, err = processGomaCccFlags(builder)
 		if err != nil {
-			return err
+			return gomaccUsed, err
 		}
 	}
 	if !gomaccUsed && allowCCache {
 		processCCacheFlag(builder)
 	}
-	return nil
+	return gomaccUsed, nil
 }
 
 func getAbsWrapperPath(env env, wrapperCmd *command) (string, error) {
diff --git a/compiler_wrapper/compiler_wrapper_test.go b/compiler_wrapper/compiler_wrapper_test.go
index 52b92f56..fd59cfe1 100644
--- a/compiler_wrapper/compiler_wrapper_test.go
+++ b/compiler_wrapper/compiler_wrapper_test.go
@@ -9,6 +9,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"os"
+	"path"
+	"path/filepath"
 	"strings"
 	"syscall"
 	"testing"
@@ -94,16 +97,61 @@ func TestLogMissingCCacheExecError(t *testing.T) {
 	})
 }
 
-func TestErrorOnLogRusageAndForceDisableWError(t *testing.T) {
+func TestGomaDisablesRusage(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
+		gomaPath := path.Join(ctx.tempDir, "gomacc")
+		ctx.writeFile(gomaPath, "")
+		ctx.env = []string{"GOMACC_PATH=" + gomaPath}
+		logFileName := filepath.Join(ctx.tempDir, "rusage.log")
 		ctx.env = []string{
-			"FORCE_DISABLE_WERROR=1",
-			"GETRUSAGE=rusage.log",
+			"TOOLCHAIN_RUSAGE_OUTPUT=" + logFileName,
+			"GOMACC_PATH=" + gomaPath,
 		}
-		stderr := ctx.mustFail(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
-		if err := verifyNonInternalError(stderr, "GETRUSAGE is meaningless with FORCE_DISABLE_WERROR"); err != nil {
+		cmd := ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
+		// Ensure Goma was used
+		if err := verifyPath(cmd, gomaPath); err != nil {
+			t.Fatal(err)
+		}
+		if err := verifyArgOrder(cmd, gccX86_64+".real", mainCc); err != nil {
 			t.Error(err)
 		}
+		// Ensure rusage log was not created
+		if _, err := os.Stat(logFileName); err == nil {
+			t.Errorf("Logfile shouldn't have been created at TOOLCHAIN_RUSAGE_OUTPUT path %q but was", logFileName)
+		} else if !os.IsNotExist(err) {
+			t.Fatalf("error checking for rusage logfile at %q: %v", logFileName, err)
+		}
+	})
+}
+
+func TestLogRusageAndForceDisableWError(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		logFileName := filepath.Join(ctx.tempDir, "rusage.log")
+		ctx.env = []string{
+			"FORCE_DISABLE_WERROR=1",
+			"TOOLCHAIN_RUSAGE_OUTPUT=" + logFileName,
+		}
+		ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
+			switch ctx.cmdCount {
+			case 1:
+				io.WriteString(stderr, "-Werror originalerror")
+				return newExitCodeError(1)
+			case 2:
+				return nil
+			default:
+				t.Fatalf("unexpected command: %#v", cmd)
+				return nil
+			}
+		}
+		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(clangX86_64, mainCc)))
+		if _, err := os.Stat(logFileName); os.IsNotExist(err) {
+			t.Errorf("no logfile created at TOOLCHAIN_RUSAGE_OUTPUT path %q", logFileName)
+		} else if err != nil {
+			t.Fatalf("error checking for rusage logfile at %q: %v", logFileName, err)
+		}
+		if ctx.cmdCount != 2 {
+			t.Errorf("expected 2 calls. Got: %d", ctx.cmdCount)
+		}
 	})
 }
 
@@ -111,10 +159,10 @@ func TestErrorOnLogRusageAndBisect(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
 		ctx.env = []string{
 			"BISECT_STAGE=xyz",
-			"GETRUSAGE=rusage.log",
+			"TOOLCHAIN_RUSAGE_OUTPUT=rusage.log",
 		}
 		stderr := ctx.mustFail(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
-		if err := verifyNonInternalError(stderr, "BISECT_STAGE is meaningless with GETRUSAGE"); err != nil {
+		if err := verifyNonInternalError(stderr, "TOOLCHAIN_RUSAGE_OUTPUT is meaningless with BISECT_STAGE"); err != nil {
 			t.Error(err)
 		}
 	})
@@ -126,7 +174,7 @@ func TestErrorOnBisectAndForceDisableWError(t *testing.T) {
 			"BISECT_STAGE=xyz",
 			"FORCE_DISABLE_WERROR=1",
 		}
-		stderr := ctx.mustFail(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
+		stderr := ctx.mustFail(callCompiler(ctx, ctx.cfg, ctx.newCommand(clangX86_64, mainCc)))
 		if err := verifyNonInternalError(stderr, "BISECT_STAGE is meaningless with FORCE_DISABLE_WERROR"); err != nil {
 			t.Error(err)
 		}
diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go
index 8b5432b8..d6023846 100644
--- a/compiler_wrapper/config.go
+++ b/compiler_wrapper/config.go
@@ -106,7 +106,10 @@ func getConfig(configName string, useCCache bool, useLlvmNext bool, version stri
 // Temporarily disable function splitting because of chromium:434751.
 var crosHardenedConfig = &config{
 	rootRelPath: "../../../../..",
+	// Pass "-fcommon" till the packages are fixed to work with new clang/gcc
+	// default of "-fno-common", crbug.com/1060413.
 	commonFlags: []string{
+		"-fcommon",
 		"-fstack-protector-strong",
 		"-fPIE",
 		"-pie",
@@ -122,14 +125,12 @@ var crosHardenedConfig = &config{
 	// Temporarily add no-unknown-warning-option to deal with old clang versions.
 	// Temporarily disable Wsection since kernel gets a bunch of these. chromium:778867
 	// Disable "-faddrsig" since it produces object files that strip doesn't understand, chromium:915742.
-	// Pass "-fcommon" till the packages are fixed to work with new clang default
-	// "-fno-common", crbug.com/1060413.
 	// crbug.com/1103065: -grecord-gcc-switches pollutes the Goma cache;
 	//   removed that flag for now.
 	clangFlags: []string{
 		"-Qunused-arguments",
 		"-fno-addrsig",
-		"-fcommon",
+		"-fdebug-default-version=5",
 		"-Wno-tautological-constant-compare",
 		"-Wno-tautological-unsigned-enum-zero-compare",
 		"-Wno-unknown-warning-option",
@@ -166,6 +167,7 @@ var crosNonHardenedConfig = &config{
 	// Temporarily disable Wsection since kernel gets a bunch of these. chromium:778867
 	clangFlags: []string{
 		"-Qunused-arguments",
+		"-fdebug-default-version=5",
 		"-Wno-tautological-constant-compare",
 		"-Wno-tautological-unsigned-enum-zero-compare",
 		"-Wno-unknown-warning-option",
@@ -190,7 +192,11 @@ var crosNonHardenedConfig = &config{
 var crosHostConfig = &config{
 	isHostWrapper: true,
 	rootRelPath:   "../..",
-	commonFlags:   []string{},
+	// Pass "-fcommon" till the packages are fixed to work with new clang/gcc
+	// default of "-fno-common", crbug.com/1060413.
+	commonFlags: []string{
+		"-fcommon",
+	},
 	gccFlags: []string{
 		"-Wno-maybe-uninitialized",
 		"-Wno-unused-local-typedefs",
@@ -198,15 +204,13 @@ var crosHostConfig = &config{
 	},
 	// Temporarily disable tautological-*-compare chromium:778316.
 	// Temporarily add no-unknown-warning-option to deal with old clang versions.
-	// Pass "-fcommon" till the packages are fixed to work with new clang default
-	// "-fno-common", crbug.com/1060413.
 	// crbug.com/1103065: -grecord-gcc-switches pollutes the Goma cache;
 	//   removed that flag for now.
 	clangFlags: []string{
 		"-Qunused-arguments",
 		"-fno-addrsig",
-		"-fcommon",
 		"-fuse-ld=lld",
+		"-fdebug-default-version=5",
 		"-Wno-unused-local-typedefs",
 		"-Wno-deprecated-declarations",
 		"-Wno-tautological-constant-compare",
diff --git a/compiler_wrapper/cros_hardened_config_test.go b/compiler_wrapper/cros_hardened_config_test.go
index b459f1e2..6d96b182 100644
--- a/compiler_wrapper/cros_hardened_config_test.go
+++ b/compiler_wrapper/cros_hardened_config_test.go
@@ -517,7 +517,7 @@ func createClangArgsGoldenInputs() goldenFile {
 		Name: "clang_specific_args.json",
 		Records: []goldenRecord{
 			{
-				WrapperCmd: newGoldenCmd(clangX86_64, "-mno-movbe", "-pass-exit-codes", "-Wclobbered", "-Wno-psabi", "-Wlogical-op",
+				WrapperCmd: newGoldenCmd(clangX86_64, "-mno-movbe", "-Wclobbered", "-Wno-psabi", "-Wlogical-op",
 					"-Wmissing-parameter-type", "-Wold-style-declaration", "-Woverride-init", "-Wunsafe-loop-optimizations",
 					"-Wstrict-aliasing=abc", "-finline-limit=abc", mainCc),
 				Cmds: okResults,
diff --git a/compiler_wrapper/disable_werror_flag.go b/compiler_wrapper/disable_werror_flag.go
index 8f20b6f3..5c21b1ad 100644
--- a/compiler_wrapper/disable_werror_flag.go
+++ b/compiler_wrapper/disable_werror_flag.go
@@ -19,10 +19,15 @@ import (
 
 const numWErrorEstimate = 30
 
-func shouldForceDisableWerror(env env, cfg *config) bool {
+func shouldForceDisableWerror(env env, cfg *config, ty compilerType) bool {
 	if cfg.isAndroidWrapper {
 		return cfg.useLlvmNext
 	}
+
+	// We only want this functionality for clang.
+	if ty != clangType {
+		return false
+	}
 	value, _ := env.getenv("FORCE_DISABLE_WERROR")
 	return value != ""
 }
@@ -70,8 +75,12 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo
 		return 0, wrapErrorwithSourceLocf(err, "prebuffering stdin: %v", err)
 	}
 
-	originalExitCode, err := wrapSubprocessErrorWithSourceLoc(originalCmd,
-		env.run(originalCmd, getStdin(), originalStdoutBuffer, originalStderrBuffer))
+	var originalExitCode int
+	commitOriginalRusage, err := maybeCaptureRusage(env, originalCmd, func(willLogRusage bool) error {
+		originalExitCode, err = wrapSubprocessErrorWithSourceLoc(originalCmd,
+			env.run(originalCmd, getStdin(), originalStdoutBuffer, originalStderrBuffer))
+		return err
+	})
 	if err != nil {
 		return 0, err
 	}
@@ -85,6 +94,9 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo
 			bytes.Contains(originalStdoutBufferBytes, []byte("warnings-as-errors")) ||
 			bytes.Contains(originalStdoutBufferBytes, []byte("clang-diagnostic-")))
 	if !shouldRetry {
+		if err := commitOriginalRusage(originalExitCode); err != nil {
+			return 0, fmt.Errorf("commiting rusage: %v", err)
+		}
 		originalStdoutBuffer.WriteTo(env.stdout())
 		originalStderrBuffer.WriteTo(env.stderr())
 		return originalExitCode, nil
@@ -97,19 +109,32 @@ func doubleBuildWithWNoError(env env, cfg *config, originalCmd *command) (exitCo
 		Args:       disableWerrorFlags(originalCmd.Args),
 		EnvUpdates: originalCmd.EnvUpdates,
 	}
-	retryExitCode, err := wrapSubprocessErrorWithSourceLoc(retryCommand,
-		env.run(retryCommand, getStdin(), retryStdoutBuffer, retryStderrBuffer))
+
+	var retryExitCode int
+	commitRetryRusage, err := maybeCaptureRusage(env, retryCommand, func(willLogRusage bool) error {
+		retryExitCode, err = wrapSubprocessErrorWithSourceLoc(retryCommand,
+			env.run(retryCommand, getStdin(), retryStdoutBuffer, retryStderrBuffer))
+		return err
+	})
 	if err != nil {
 		return 0, err
 	}
+
 	// If -Wno-error fixed us, pretend that we never ran without -Wno-error. Otherwise, pretend
 	// that we never ran the second invocation.
 	if retryExitCode != 0 {
 		originalStdoutBuffer.WriteTo(env.stdout())
 		originalStderrBuffer.WriteTo(env.stderr())
+		if err := commitOriginalRusage(originalExitCode); err != nil {
+			return 0, fmt.Errorf("commiting rusage: %v", err)
+		}
 		return originalExitCode, nil
 	}
 
+	if err := commitRetryRusage(retryExitCode); err != nil {
+		return 0, fmt.Errorf("commiting rusage: %v", err)
+	}
+
 	retryStdoutBuffer.WriteTo(env.stdout())
 	retryStderrBuffer.WriteTo(env.stderr())
 
diff --git a/compiler_wrapper/disable_werror_flag_test.go b/compiler_wrapper/disable_werror_flag_test.go
index 0c43dbe0..d0054262 100644
--- a/compiler_wrapper/disable_werror_flag_test.go
+++ b/compiler_wrapper/disable_werror_flag_test.go
@@ -412,13 +412,21 @@ func TestAndroidDisableWerror(t *testing.T) {
 
 		// Disable werror ON
 		ctx.cfg.useLlvmNext = true
-		if !shouldForceDisableWerror(ctx, ctx.cfg) {
+		if !shouldForceDisableWerror(ctx, ctx.cfg, gccType) {
+			t.Errorf("disable Werror not enabled for Android with useLlvmNext")
+		}
+
+		if !shouldForceDisableWerror(ctx, ctx.cfg, clangType) {
 			t.Errorf("disable Werror not enabled for Android with useLlvmNext")
 		}
 
 		// Disable werror OFF
 		ctx.cfg.useLlvmNext = false
-		if shouldForceDisableWerror(ctx, ctx.cfg) {
+		if shouldForceDisableWerror(ctx, ctx.cfg, gccType) {
+			t.Errorf("disable-Werror enabled for Android without useLlvmNext")
+		}
+
+		if shouldForceDisableWerror(ctx, ctx.cfg, clangType) {
 			t.Errorf("disable-Werror enabled for Android without useLlvmNext")
 		}
 	})
@@ -426,12 +434,28 @@ func TestAndroidDisableWerror(t *testing.T) {
 
 func TestChromeOSNoForceDisableWerror(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
-		if shouldForceDisableWerror(ctx, ctx.cfg) {
+		if shouldForceDisableWerror(ctx, ctx.cfg, gccType) {
+			t.Errorf("disable Werror enabled for ChromeOS without FORCE_DISABLE_WERROR set")
+		}
+
+		if shouldForceDisableWerror(ctx, ctx.cfg, clangType) {
 			t.Errorf("disable Werror enabled for ChromeOS without FORCE_DISABLE_WERROR set")
 		}
 	})
 }
 
+func TestChromeOSForceDisableWerrorOnlyAppliesToClang(t *testing.T) {
+	withForceDisableWErrorTestContext(t, func(ctx *testContext) {
+		if !shouldForceDisableWerror(ctx, ctx.cfg, clangType) {
+			t.Errorf("Disable -Werror should be enabled for clang.")
+		}
+
+		if shouldForceDisableWerror(ctx, ctx.cfg, gccType) {
+			t.Errorf("Disable -Werror should be disabled for gcc.")
+		}
+	})
+}
+
 func TestClangTidyNoDoubleBuild(t *testing.T) {
 	withTestContext(t, func(ctx *testContext) {
 		ctx.cfg.isAndroidWrapper = true
diff --git a/compiler_wrapper/gcc_flags.go b/compiler_wrapper/gcc_flags.go
index 7141d14c..2c553e6b 100644
--- a/compiler_wrapper/gcc_flags.go
+++ b/compiler_wrapper/gcc_flags.go
@@ -11,11 +11,7 @@ func processGccFlags(builder *commandBuilder) {
 
 		// Conversion for flags supported by clang but not gcc.
 		clangToGcc := map[string]string{
-			"-march=goldmont":      "-march=silvermont",
-			"-march=goldmont-plus": "-march=silvermont",
-			"-march=skylake":       "-march=corei7",
-			"-march=tigerlake":     "-march=corei7",
-			"-march=tremont":       "-march=silvermont",
+			"-march=alderlake": "-march=skylake",
 		}
 
 		builder.transformArgs(func(arg builderArg) string {
diff --git a/compiler_wrapper/gcc_flags_test.go b/compiler_wrapper/gcc_flags_test.go
index 8de07a47..adf72018 100644
--- a/compiler_wrapper/gcc_flags_test.go
+++ b/compiler_wrapper/gcc_flags_test.go
@@ -34,11 +34,7 @@ func TestConvertClangToGccFlags(t *testing.T) {
 			in  string
 			out string
 		}{
-			{"-march=goldmont", "-march=silvermont"},
-			{"-march=goldmont-plus", "-march=silvermont"},
-			{"-march=skylake", "-march=corei7"},
-			{"-march=tigerlake", "-march=corei7"},
-			{"-march=tremont", "-march=silvermont"},
+			{"-march=alderlake", "-march=skylake"},
 		}
 
 		for _, tt := range tests {
diff --git a/compiler_wrapper/kernel_bug.go b/compiler_wrapper/kernel_bug.go
new file mode 100644
index 00000000..55817cb6
--- /dev/null
+++ b/compiler_wrapper/kernel_bug.go
@@ -0,0 +1,25 @@
+// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+package main
+
+import (
+	"bytes"
+	"strings"
+)
+
+// crbug.com/1166017
+
+const kernelBugRetryLimit = 25
+
+// GCC will sometimes fail to wait on subprocesses due to this kernel bug. It always fails the
+// compilation and prints "Unknown error 512" in that case.
+func containsTracesOfKernelBug(buf []byte) bool {
+	return bytes.Contains(buf, []byte("Unknown error 512"))
+}
+
+func errorContainsTracesOfKernelBug(err error) bool {
+	// We'll get errors that look like "waitid: errno 512." Presumably, this isn't specific to
+	// waitid, so just try to match the "errno 512" ending.
+	return err != nil && strings.HasSuffix(err.Error(), "errno 512")
+}
diff --git a/compiler_wrapper/kernel_bug_test.go b/compiler_wrapper/kernel_bug_test.go
new file mode 100644
index 00000000..3c7bccf1
--- /dev/null
+++ b/compiler_wrapper/kernel_bug_test.go
@@ -0,0 +1,74 @@
+// Copyright 2021 The Chromium OS Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+package main
+
+import (
+	"errors"
+	"io"
+	"testing"
+)
+
+func getErrorIndicatingKernelBug() error {
+	return errors.New("waitid: errno 512")
+}
+
+func TestWrapperRetriesCompilationsOnApparentKernelBugsSurfacedInGo(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
+			switch {
+			case ctx.cmdCount < kernelBugRetryLimit:
+				return getErrorIndicatingKernelBug()
+
+			case ctx.cmdCount == kernelBugRetryLimit:
+				return nil
+
+			default:
+				t.Fatalf("unexpected command: %#v", cmd)
+				return nil
+			}
+		}
+		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
+		if ctx.cmdCount != kernelBugRetryLimit {
+			t.Errorf("expected %d retries. Got: %d", kernelBugRetryLimit, ctx.cmdCount)
+		}
+	})
+}
+
+func TestWrapperRetriesCompilationsOnApparentKernelBugsSurfacedInGCC(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
+			if ctx.cmdCount >= kernelBugRetryLimit {
+				return nil
+			}
+			_, err := io.WriteString(stderr, "fatal error: failed to get exit status: Unknown error 512")
+			if err != nil {
+				t.Fatalf("Failed writing to stdout: %v", err)
+			}
+			return newExitCodeError(1)
+		}
+		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
+		if ctx.cmdCount != kernelBugRetryLimit {
+			t.Errorf("expected %d retries. Got: %d", kernelBugRetryLimit, ctx.cmdCount)
+		}
+	})
+}
+
+func TestWrapperOnlyRetriesCompilationAFiniteNumberOfTimes(t *testing.T) {
+	withTestContext(t, func(ctx *testContext) {
+		kernelBugErr := getErrorIndicatingKernelBug()
+		ctx.cmdMock = func(cmd *command, stdin io.Reader, stdout io.Writer, stderr io.Writer) error {
+			if ctx.cmdCount > kernelBugRetryLimit {
+				t.Fatal("command count exceeded kernel bug retry limit; infinite loop?")
+			}
+			return kernelBugErr
+		}
+		stderr := ctx.mustFail(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
+		if err := verifyInternalError(stderr); err != nil {
+			t.Errorf("Internal error wasn't reported: %v", err)
+		}
+		if ctx.cmdCount != kernelBugRetryLimit {
+			t.Errorf("expected %d retries. Got: %d", kernelBugRetryLimit, ctx.cmdCount)
+		}
+	})
+}
diff --git a/compiler_wrapper/libc_exec.go b/compiler_wrapper/libc_exec.go
index d9867733..a7a561bc 100644
--- a/compiler_wrapper/libc_exec.go
+++ b/compiler_wrapper/libc_exec.go
@@ -18,7 +18,20 @@ package main
 //	// Since fork() brings us to one thread, we can only use async-signal-safe funcs below.
 //	pid_t pid = fork();
 //	if (pid == 0) {
-//		execve(pathname, argv, envp);
+//		// crbug.com/1166017: we're (very rarely) getting ERESTARTSYS on some builders.
+//		// Documentation indicates that this is a bug in the kernel. Work around it by
+//		// retrying. 25 is an arbitrary retry number that Should Be Enough For Anyone(TM).
+//		int i = 0;
+//		for (; i < 25; i++) {
+//			execve(pathname, argv, envp);
+//			if (errno != 512) {
+//				break;
+//			}
+//			// Sleep a bit. Not sure if this helps, but if the condition we're seeing is
+//			// transient, it *hopefully* should. nanosleep isn't async-signal safe, so
+//			// we have to live with sleep()
+//			sleep(1);
+//		}
 //		fprintf(stderr, "exec failed (errno: %d)\n", errno);
 //		_exit(1);
 //	}
diff --git a/compiler_wrapper/reset_compiler_wrapper.sh b/compiler_wrapper/reset_compiler_wrapper.sh
new file mode 100755
index 00000000..523e972d
--- /dev/null
+++ b/compiler_wrapper/reset_compiler_wrapper.sh
@@ -0,0 +1,42 @@
+#!/bin/bash -eux
+#
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# If your compiler wrapper ends up broken, you can run this script to try to
+# restore it to a working version. We can only use artifacts we download from
+# gs://, since it's kind of hard to build a working compiler with a broken
+# compiler wrapper. ;)
+
+if [[ ! -e "/etc/cros_chroot_version" ]]; then
+  echo "Run me inside of the chroot."
+  exit 1
+fi
+
+packages_to_reemerge=(
+  # We want to reemerge the host wrapper...
+  sys-devel/llvm
+)
+
+gcc_wrappers=(
+  cross-x86_64-cros-linux-gnu/gcc
+  cross-armv7a-cros-linux-gnueabihf/gcc
+  cross-aarch64-cros-linux-gnu/gcc
+)
+
+# ...and any existing target wrappers.
+for gcc in "${gcc_wrappers[@]}"; do
+  # cheap check for whether or not the package in question is already installed
+  if ls /var/db/pkg/"${gcc}"-* >& /dev/null; then
+    packages_to_reemerge+=( "${gcc}" )
+  fi
+done
+
+# Ensure that we don't pick up any broken binpkgs for these when we install
+# them below.
+for pkg in "${packages_to_reemerge[@]}"; do
+  sudo rm -f "/var/lib/portage/pkgs/${pkg}"*
+done
+
+sudo emerge -j16 -G "${packages_to_reemerge[@]}"
diff --git a/compiler_wrapper/rusage_flag.go b/compiler_wrapper/rusage_flag.go
index 690308b2..4aa40b4d 100644
--- a/compiler_wrapper/rusage_flag.go
+++ b/compiler_wrapper/rusage_flag.go
@@ -5,19 +5,23 @@
 package main
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"syscall"
 	"time"
 )
 
 func getRusageLogFilename(env env) string {
-	value, _ := env.getenv("GETRUSAGE")
+	value, _ := env.getenv("TOOLCHAIN_RUSAGE_OUTPUT")
 	return value
 }
 
+func isRusageEnabled(env env) bool {
+	return getRusageLogFilename(env) != ""
+}
+
 func lockFileExclusive(fd uintptr) error {
 	maxTries := 100
 	for i := 0; i < maxTries; i++ {
@@ -38,67 +42,119 @@ func lockFileExclusive(fd uintptr) error {
 	return fmt.Errorf("locking file failed after %d tries", maxTries)
 }
 
-func logRusage(env env, logFileName string, compilerCmd *command) (exitCode int, err error) {
-	rusageBefore := syscall.Rusage{}
-	if err := syscall.Getrusage(syscall.RUSAGE_CHILDREN, &rusageBefore); err != nil {
-		return 0, err
-	}
-	compilerCmdWithoutRusage := &command{
+type rusageLog struct {
+	ExitCode         int      `json:"exit_code"`
+	ElapsedRealTime  float64  `json:"elapsed_real_time"`
+	ElapsedUserTime  float64  `json:"elapsed_user_time"`
+	ElapsedSysTime   float64  `json:"elapsed_sys_time"`
+	MaxMemUsed       int64    `json:"max_mem_used"`
+	Compiler         string   `json:"compiler"`
+	CompilerArgs     []string `json:"compiler_args"`
+	WorkingDirectory string   `json:"working_directory"`
+}
+
+func removeRusageFromCommand(compilerCmd *command) *command {
+	return &command{
 		Path:       compilerCmd.Path,
 		Args:       compilerCmd.Args,
-		EnvUpdates: append(compilerCmd.EnvUpdates, "GETRUSAGE="),
+		EnvUpdates: append(compilerCmd.EnvUpdates, "TOOLCHAIN_RUSAGE_OUTPUT="),
+	}
+}
+
+// maybeCaptureRusage captures rusage for execution of action()
+// 	unless action returns an error or logFileName is ""
+// a function is returned which saves the rusage log data at logFileName unless logFileName is ""
+// an error is returned if action returns an error, or rusage commands in syscall fails
+func maybeCaptureRusage(env env, compilerCmd *command, action func(willLogRusage bool) error) (maybeCommitToFile func(exitCode int) error, err error) {
+	logFileName := getRusageLogFilename(env)
+	willLogRusage := isRusageEnabled(env)
+	if !willLogRusage {
+		if err := action(willLogRusage); err != nil {
+			return nil, err
+		}
+		return func(int) error { return nil }, nil
+	}
+
+	rusageBefore := syscall.Rusage{}
+	if err := syscall.Getrusage(syscall.RUSAGE_CHILDREN, &rusageBefore); err != nil {
+		return nil, fmt.Errorf("getting initial rusage: %v", err)
 	}
 	startTime := time.Now()
-	exitCode, err = wrapSubprocessErrorWithSourceLoc(compilerCmdWithoutRusage,
-		env.run(compilerCmdWithoutRusage, env.stdin(), env.stdout(), env.stderr()))
-	if err != nil {
-		return 0, err
+
+	if err := action(willLogRusage); err != nil {
+		return nil, err
 	}
+
 	elapsedRealTime := time.Since(startTime)
 	rusageAfter := syscall.Rusage{}
 	if err := syscall.Getrusage(syscall.RUSAGE_CHILDREN, &rusageAfter); err != nil {
-		return 0, err
-	}
-	elapsedSysTime := time.Duration(rusageAfter.Stime.Nano()-rusageBefore.Stime.Nano()) * time.Nanosecond
-	elapsedUserTime := time.Duration(rusageAfter.Utime.Nano()-rusageBefore.Utime.Nano()) * time.Nanosecond
-	// Note: We assume that the compiler takes more heap than any other
-	// subcommands that we might have executed before.
-	maxMemUsed := rusageAfter.Maxrss
-	absCompilerPath := getAbsCmdPath(env, compilerCmd)
-
-	if err := os.MkdirAll(filepath.Dir(logFileName), 0777); err != nil {
-		return 0, wrapErrorwithSourceLocf(err, "error creating rusage log directory %s", logFileName)
+		return nil, fmt.Errorf("getting final rusage: %v", err)
 	}
 
-	timeUnit := float64(time.Second)
-	data := fmt.Sprintf("%.5f : %.5f : %.5f : %d : %s : %s\n",
-		float64(elapsedRealTime)/timeUnit, float64(elapsedUserTime)/timeUnit, float64(elapsedSysTime)/timeUnit,
-		maxMemUsed, absCompilerPath,
-		strings.Join(append([]string{filepath.Base(absCompilerPath)}, compilerCmd.Args...), " "))
+	return func(exitCode int) error {
+		elapsedSysTime := time.Duration(rusageAfter.Stime.Nano()-rusageBefore.Stime.Nano()) * time.Nanosecond
+		elapsedUserTime := time.Duration(rusageAfter.Utime.Nano()-rusageBefore.Utime.Nano()) * time.Nanosecond
+		// Note: We assume that the compiler takes more heap than any other
+		// subcommands that we might have executed before.
+		maxMemUsed := rusageAfter.Maxrss
+		absCompilerPath := getAbsCmdPath(env, compilerCmd)
 
-	// Note: using file mode 0666 so that a root-created log is writable by others.
-	logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
-	if err != nil {
-		return 0, wrapErrorwithSourceLocf(err, "creating rusage logfile %s", logFileName)
-	}
+		// We need to temporarily set umask to 0 to ensure 777 permissions are actually 777
+		// This effects builderbots in particular
+		oldMask := syscall.Umask(0)
+		defer syscall.Umask(oldMask)
 
-	// O_APPEND's atomicity guarantees are only for writes up to a certain size. If we don't
-	// lock the file, we might end up with corrupted records.
-	//
-	// Note that Close()'ing the file releases all associated locks.
-	if err := lockFileExclusive(logFile.Fd()); err != nil {
-		_ = logFile.Close()
-		return 0, wrapErrorwithSourceLocf(err, "locking rusage logfile %s: %v", logFileName, err)
-	}
+		// We want to know what package is being compiled. The working directory gives us a good clue.
+		cwd, err := os.Getwd()
+		if err != nil {
+			return wrapErrorwithSourceLocf(err, "error getting working directory for rusage log")
+		}
 
-	_, err = logFile.WriteString(data)
-	closeErr := logFile.Close()
-	if err != nil {
-		return 0, wrapErrorwithSourceLocf(err, "writing to rusage logfile %s: %v", logFileName, err)
-	}
-	if closeErr != nil {
-		return 0, wrapErrorwithSourceLocf(err, "closing rusage logfile %s: %v", logFileName, closeErr)
-	}
+		if err := os.MkdirAll(filepath.Dir(logFileName), 0777); err != nil {
+			return wrapErrorwithSourceLocf(err, "error creating rusage log directory %s", logFileName)
+		}
+
+		timeUnit := float64(time.Second)
+
+		logEntry := rusageLog{
+			ExitCode:         exitCode,
+			ElapsedRealTime:  float64(elapsedRealTime) / timeUnit,
+			ElapsedUserTime:  float64(elapsedUserTime) / timeUnit,
+			ElapsedSysTime:   float64(elapsedSysTime) / timeUnit,
+			MaxMemUsed:       maxMemUsed,
+			Compiler:         absCompilerPath,
+			CompilerArgs:     compilerCmd.Args,
+			WorkingDirectory: cwd,
+		}
+
+		// Note: using file mode 0666 so that a root-created log is writable by others.
+		logFile, err := os.OpenFile(logFileName, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
+		if err != nil {
+			return wrapErrorwithSourceLocf(err, "creating rusage logfile %s", logFileName)
+		}
+
+		// O_APPEND's atomicity guarantees are only for writes up to a certain size. If we don't
+		// lock the file, we might end up with corrupted records.
+		//
+		// Note that Close()'ing the file releases all associated locks.
+		if err := lockFileExclusive(logFile.Fd()); err != nil {
+			_ = logFile.Close()
+			return wrapErrorwithSourceLocf(err, "locking rusage logfile %s: %v", logFileName, err)
+		}
+
+		if err := json.NewEncoder(logFile).Encode(logEntry); err != nil {
+			_ = logFile.Close()
+			return wrapErrorwithSourceLocf(err, "converting rusage logfile entry to JSON %v", logEntry)
+		}
+
+		closeErr := logFile.Close()
+		if err != nil {
+			return wrapErrorwithSourceLocf(err, "writing to rusage logfile %s: %v", logFileName, err)
+		}
+		if closeErr != nil {
+			return wrapErrorwithSourceLocf(err, "closing rusage logfile %s: %v", logFileName, closeErr)
+		}
 
-	return exitCode, nil
+		return nil
+	}, nil
 }
diff --git a/compiler_wrapper/rusage_flag_test.go b/compiler_wrapper/rusage_flag_test.go
index bd0f980c..940f4a79 100644
--- a/compiler_wrapper/rusage_flag_test.go
+++ b/compiler_wrapper/rusage_flag_test.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -12,7 +13,6 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
-	"strconv"
 	"strings"
 	"testing"
 )
@@ -73,7 +73,7 @@ func TestReportGeneralErrorsFromLogRusage(t *testing.T) {
 func TestCreateDirAndFileForLogRusage(t *testing.T) {
 	withLogRusageTestContext(t, func(ctx *testContext) {
 		logFileName := filepath.Join(ctx.tempDir, "somedir", "rusage.log")
-		ctx.env = []string{"GETRUSAGE=" + logFileName}
+		ctx.env = []string{"TOOLCHAIN_RUSAGE_OUTPUT=" + logFileName}
 		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
 
 		if _, err := os.Stat(logFileName); err != nil {
@@ -85,37 +85,32 @@ func TestCreateDirAndFileForLogRusage(t *testing.T) {
 func TestLogRusageFileContent(t *testing.T) {
 	withLogRusageTestContext(t, func(ctx *testContext) {
 		logFileName := filepath.Join(ctx.tempDir, "rusage.log")
-		ctx.env = []string{"GETRUSAGE=" + logFileName}
+		ctx.env = []string{"TOOLCHAIN_RUSAGE_OUTPUT=" + logFileName}
 		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
 
 		data, err := ioutil.ReadFile(logFileName)
 		if err != nil {
 			t.Errorf("could not read the rusage log file. Error: %s", err)
 		}
-		// Example output:
-		// 0.100318 : 0.103412 : 0.096386 : 6508 : /tmp/compiler_wrapper036306868/x86_64-cros-linux-gnu-gcc.real : x86_64-cros-linux-gnu-gcc.real --sysroot=/tmp/compiler_wrapper036306868/usr/x86_64-cros-linux-gnu main.cc -mno-movbe
-		logParts := strings.Split(string(data), " : ")
-		if len(logParts) != 6 {
-			t.Errorf("unexpected number of rusage log parts. Got: %s", logParts)
+
+		rlog := rusageLog{}
+
+		if err := json.Unmarshal(data, &rlog); err != nil {
+			t.Fatalf("rusage log could not be unmarshalled. Got: %s", data)
 		}
 
-		// First 3 numbers are times in seconds.
-		for i := 0; i < 3; i++ {
-			if _, err := strconv.ParseFloat(logParts[i], 64); err != nil {
-				t.Errorf("unexpected value for index %d. Got: %s", i, logParts[i])
-			}
+		if rlog.Compiler != filepath.Join(ctx.tempDir, gccX86_64+".real") {
+			t.Errorf("unexpected compiler path. Got: %s", rlog.Compiler)
 		}
-		// Then an int for the memory usage
-		if _, err := strconv.ParseInt(logParts[3], 10, 64); err != nil {
-			t.Errorf("unexpected mem usage. Got: %s", logParts[3])
+		if matched, _ := regexp.MatchString("--sysroot=.*", rlog.CompilerArgs[0]); !matched {
+			t.Errorf("unexpected compiler args. Got: %s", rlog.CompilerArgs)
 		}
-		// Then the full path of the compiler
-		if logParts[4] != filepath.Join(ctx.tempDir, gccX86_64+".real") {
-			t.Errorf("unexpected compiler path. Got: %s", logParts[4])
+		cwd, err := os.Getwd()
+		if err != nil {
+			t.Fatalf("Failed to get current working directory: %v", err)
 		}
-		// Then the arguments, prefixes with the compiler basename
-		if matched, _ := regexp.MatchString("x86_64-cros-linux-gnu-gcc.real --sysroot=.* main.cc", logParts[5]); !matched {
-			t.Errorf("unexpected compiler args. Got: %s", logParts[5])
+		if rlog.WorkingDirectory != cwd {
+			t.Errorf("Unexpected working directory. Got: %q, Want: %q", rlog.WorkingDirectory, cwd)
 		}
 	})
 }
@@ -123,7 +118,7 @@ func TestLogRusageFileContent(t *testing.T) {
 func TestLogRusageAppendsToFile(t *testing.T) {
 	withLogRusageTestContext(t, func(ctx *testContext) {
 		logFileName := filepath.Join(ctx.tempDir, "rusage.log")
-		ctx.env = []string{"GETRUSAGE=" + logFileName}
+		ctx.env = []string{"TOOLCHAIN_RUSAGE_OUTPUT=" + logFileName}
 
 		ctx.must(callCompiler(ctx, ctx.cfg, ctx.newCommand(gccX86_64, mainCc)))
 		data, err := ioutil.ReadFile(logFileName)
@@ -164,7 +159,7 @@ func TestLogRusageAppendsToFile(t *testing.T) {
 
 func withLogRusageTestContext(t *testing.T, work func(ctx *testContext)) {
 	withTestContext(t, func(ctx *testContext) {
-		ctx.env = []string{"GETRUSAGE=" + filepath.Join(ctx.tempDir, "rusage.log")}
+		ctx.env = []string{"TOOLCHAIN_RUSAGE_OUTPUT=" + filepath.Join(ctx.tempDir, "rusage.log")}
 		work(ctx)
 	})
 }
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"
           ],