diff options
| author | George Burgess IV <gbiv@google.com> | 2020-03-20 23:08:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-20 23:08:07 +0000 |
| commit | a1e965c2ab05854a9cbc7ae5a07276c74bdda073 (patch) | |
| tree | beb9461f9145ccd3526f17d64b626c293856d040 | |
| parent | 2b77a1ae625e29891db3e8ec5022d557a6d8ebfa (diff) | |
| parent | 3868531aa10b83be20b2dead96f1b294a290c96e (diff) | |
| download | toolchain-utils-a1e965c2ab05854a9cbc7ae5a07276c74bdda073.tar.gz | |
Merging 9 commit(s) from Chromium's toolchain-utils am: 35b8ca1aa6 am: 3868531aa1
Change-Id: I9b411d6ad0e9a346c5325787acfe0808f8529164
59 files changed, 249 insertions, 263 deletions
diff --git a/afdo_metadata/kernel_afdo.json b/afdo_metadata/kernel_afdo.json index d718a3ff..2ff040e1 100644 --- a/afdo_metadata/kernel_afdo.json +++ b/afdo_metadata/kernel_afdo.json @@ -3,15 +3,15 @@ "name": "R81-12607.58-1578524353" }, "chromeos-kernel-4_4": { - "name": "R82-12946.0-1583747127" + "name": "R82-12970.0-1584351905" }, "chromeos-kernel-3_18": { - "name": "R82-12946.0-1583746637" + "name": "R82-12970.0-1584351611" }, "chromeos-kernel-4_14": { - "name": "R82-12946.0-1583746805" + "name": "R82-12970.0-1584351383" }, "chromeos-kernel-4_19": { - "name": "R82-12946.0-1583746646" + "name": "R82-12970.0-1584352180" } }
\ No newline at end of file diff --git a/compiler_wrapper/ccache_flag.go b/compiler_wrapper/ccache_flag.go index 312d0f02..265b8fc2 100644 --- a/compiler_wrapper/ccache_flag.go +++ b/compiler_wrapper/ccache_flag.go @@ -4,7 +4,7 @@ package main -func processCCacheFlag(sysroot string, builder *commandBuilder) { +func processCCacheFlag(builder *commandBuilder) { // We should be able to share the objects across compilers as // the pre-processed output will differ. This allows boards // that share compiler flags (like x86 boards) to share caches. @@ -20,24 +20,8 @@ func processCCacheFlag(sysroot string, builder *commandBuilder) { }) if builder.cfg.useCCache && useCCache { - // We need to get ccache to make relative paths from within the - // sysroot. This lets us share cached files across boards (if - // all other things are equal of course like CFLAGS) as well as - // across versions. A quick test is something like: - // $ export CFLAGS='-O2 -g -pipe' CXXFLAGS='-O2 -g -pipe' - // $ BOARD=x86-alex - // $ cros_workon-$BOARD stop cros-disks - // $ emerge-$BOARD cros-disks - // $ cros_workon-$BOARD start cros-disks - // $ emerge-$BOARD cros-disks - // $ BOARD=amd64-generic - // $ cros_workon-$BOARD stop cros-disks - // $ emerge-$BOARD cros-disks - // $ cros_workon-$BOARD start cros-disks - // $ emerge-$BOARD cros-disks - // All of those will get cache hits (ignoring the first one - // which will seed the cache) due to this setting. - builder.updateEnv("CCACHE_BASEDIR=" + sysroot) + // Note: we used to also set CCACHE_BASEDIR but don't do it + // anymore for reasons outlined in crrev.com/c/2103170. if _, present := builder.env.getenv("CCACHE_DISABLE"); present { // Portage likes to set this for us when it has FEATURES=-ccache. // The other vars we need to setup manually because of tools like diff --git a/compiler_wrapper/ccache_flag_test.go b/compiler_wrapper/ccache_flag_test.go index 61abef06..03a74de8 100644 --- a/compiler_wrapper/ccache_flag_test.go +++ b/compiler_wrapper/ccache_flag_test.go @@ -54,17 +54,6 @@ func TestSetCacheDir(t *testing.T) { }) } -func TestSetCacheBaseDirToSysroot(t *testing.T) { - withCCacheEnabledTestContext(t, func(ctx *testContext) { - cmd := ctx.must(callCompiler(ctx, ctx.cfg, - ctx.newCommand(gccX86_64, mainCc))) - if err := verifyEnvUpdate(cmd, - "CCACHE_BASEDIR="+ctx.tempDir+"/usr/x86_64-cros-linux-gnu"); err != nil { - t.Error(err) - } - }) -} - func TestSetCacheUmask(t *testing.T) { withCCacheEnabledTestContext(t, func(ctx *testContext) { cmd := ctx.must(callCompiler(ctx, ctx.cfg, diff --git a/compiler_wrapper/compiler_wrapper.go b/compiler_wrapper/compiler_wrapper.go index c8c3b6f9..da9c8660 100644 --- a/compiler_wrapper/compiler_wrapper.go +++ b/compiler_wrapper/compiler_wrapper.go @@ -91,7 +91,7 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int } } else if mainBuilder.target.compilerType == clangType { cSrcFile, useClangTidy := processClangTidyFlags(mainBuilder) - sysroot, err := prepareClangCommand(mainBuilder) + err := prepareClangCommand(mainBuilder) if err != nil { return 0, err } @@ -103,7 +103,7 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int return 0, err } } - if err := processGomaCCacheFlags(sysroot, allowCCache, mainBuilder); err != nil { + if err := processGomaCCacheFlags(allowCCache, mainBuilder); err != nil { return 0, err } compilerCmd = mainBuilder.build() @@ -162,35 +162,30 @@ func callCompilerInternal(env env, cfg *config, inputCmd *command) (exitCode int return wrapSubprocessErrorWithSourceLoc(compilerCmd, env.exec(compilerCmd)) } -func prepareClangCommand(builder *commandBuilder) (sysroot string, err error) { - sysroot = "" +func prepareClangCommand(builder *commandBuilder) (err error) { if !builder.cfg.isHostWrapper { - sysroot = processSysrootFlag(builder) + processSysrootFlag(builder) } builder.addPreUserArgs(builder.cfg.clangFlags...) builder.addPostUserArgs(builder.cfg.clangPostFlags...) calcCommonPreUserArgs(builder) - if err := processClangFlags(builder); err != nil { - return "", err - } - return sysroot, nil + return processClangFlags(builder) } func calcClangCommand(allowCCache bool, builder *commandBuilder) (*command, error) { - sysroot, err := prepareClangCommand(builder) + err := prepareClangCommand(builder) if err != nil { return nil, err } - if err := processGomaCCacheFlags(sysroot, allowCCache, builder); err != nil { + if err := processGomaCCacheFlags(allowCCache, builder); err != nil { return nil, err } return builder.build(), nil } func calcGccCommand(builder *commandBuilder) (*command, error) { - sysroot := "" if !builder.cfg.isHostWrapper { - sysroot = processSysrootFlag(builder) + processSysrootFlag(builder) } builder.addPreUserArgs(builder.cfg.gccFlags...) if !builder.cfg.isHostWrapper { @@ -199,7 +194,7 @@ func calcGccCommand(builder *commandBuilder) (*command, error) { processGccFlags(builder) if !builder.cfg.isHostWrapper { allowCCache := true - if err := processGomaCCacheFlags(sysroot, allowCCache, builder); err != nil { + if err := processGomaCCacheFlags(allowCCache, builder); err != nil { return nil, err } } @@ -217,7 +212,7 @@ func calcCommonPreUserArgs(builder *commandBuilder) { processSanitizerFlags(builder) } -func processGomaCCacheFlags(sysroot string, allowCCache bool, builder *commandBuilder) (err error) { +func processGomaCCacheFlags(allowCCache bool, builder *commandBuilder) (err error) { gomaccUsed := false if !builder.cfg.isHostWrapper { gomaccUsed, err = processGomaCccFlags(builder) @@ -226,7 +221,7 @@ func processGomaCCacheFlags(sysroot string, allowCCache bool, builder *commandBu } } if !gomaccUsed && allowCCache { - processCCacheFlag(sysroot, builder) + processCCacheFlag(builder) } return nil } diff --git a/compiler_wrapper/config.go b/compiler_wrapper/config.go index ed0b597b..fc43a29b 100644 --- a/compiler_wrapper/config.go +++ b/compiler_wrapper/config.go @@ -118,10 +118,13 @@ 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. clangFlags: []string{ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -178,10 +181,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. clangFlags: []string{ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/gcc_flags.go b/compiler_wrapper/gcc_flags.go index 397bf82d..7141d14c 100644 --- a/compiler_wrapper/gcc_flags.go +++ b/compiler_wrapper/gcc_flags.go @@ -14,6 +14,7 @@ func processGccFlags(builder *commandBuilder) { "-march=goldmont": "-march=silvermont", "-march=goldmont-plus": "-march=silvermont", "-march=skylake": "-march=corei7", + "-march=tigerlake": "-march=corei7", "-march=tremont": "-march=silvermont", } diff --git a/compiler_wrapper/gcc_flags_test.go b/compiler_wrapper/gcc_flags_test.go index 8f8e9023..8de07a47 100644 --- a/compiler_wrapper/gcc_flags_test.go +++ b/compiler_wrapper/gcc_flags_test.go @@ -37,6 +37,7 @@ func TestConvertClangToGccFlags(t *testing.T) { {"-march=goldmont", "-march=silvermont"}, {"-march=goldmont-plus", "-march=silvermont"}, {"-march=skylake", "-march=corei7"}, + {"-march=tigerlake", "-march=corei7"}, {"-march=tremont", "-march=silvermont"}, } diff --git a/compiler_wrapper/sysroot_flag.go b/compiler_wrapper/sysroot_flag.go index 67625b3b..501fb20e 100644 --- a/compiler_wrapper/sysroot_flag.go +++ b/compiler_wrapper/sysroot_flag.go @@ -9,7 +9,7 @@ import ( "strings" ) -func processSysrootFlag(builder *commandBuilder) string { +func processSysrootFlag(builder *commandBuilder) { fromUser := false for _, arg := range builder.args { if arg.fromUser && strings.HasPrefix(arg.value, "--sysroot=") { @@ -28,5 +28,4 @@ func processSysrootFlag(builder *commandBuilder) string { if !fromUser { builder.addPreUserArgs("--sysroot=" + sysroot) } - return sysroot } diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json index e29d77e0..606fecda 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/bisect.json @@ -27,6 +27,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -74,6 +75,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -124,6 +126,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json index 5036312d..7f45584a 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_ftrapv_maincc_target_specific.json @@ -18,6 +18,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -52,6 +53,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -86,6 +88,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -120,6 +123,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -154,6 +158,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -188,6 +193,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -222,6 +228,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -256,6 +263,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -290,6 +298,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json index 6e897172..afb0329e 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_host_wrapper.json @@ -17,6 +17,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json index ab3ce44c..05b0ff96 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_maincc_target_specific.json @@ -17,6 +17,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -50,6 +51,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -83,6 +85,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -116,6 +119,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -149,6 +153,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -182,6 +187,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -215,6 +221,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -248,6 +255,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -281,6 +289,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json index b2de2870..f7924a06 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_path.json @@ -17,6 +17,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -53,6 +54,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -89,6 +91,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -125,6 +128,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -168,6 +172,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -216,6 +221,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -264,6 +270,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -302,6 +309,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -335,6 +343,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -368,6 +377,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -401,6 +411,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -437,6 +448,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json index fff7d0fd..11ebc821 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_sanitizer_args.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -55,6 +56,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -91,6 +93,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -127,6 +130,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -162,6 +166,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -199,6 +204,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -236,6 +242,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -271,6 +278,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json index 568ab6eb..7a724c88 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clang_specific_args.json @@ -28,6 +28,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -62,6 +63,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -97,6 +99,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -132,6 +135,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -167,6 +171,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -202,6 +207,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -237,6 +243,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json index 43f02b45..b4cd44c2 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/clangtidy.json @@ -33,6 +33,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -53,6 +54,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -103,6 +105,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -123,6 +126,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -175,6 +179,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -198,6 +203,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -251,6 +257,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -271,6 +278,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json index f1de9518..66e58dc9 100644 --- a/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_clang_host_golden/force_disable_werror.json @@ -20,6 +20,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -56,6 +57,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -78,6 +80,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -118,6 +121,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", @@ -140,6 +144,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-fuse-ld=lld", "-Wno-unused-local-typedefs", "-Wno-deprecated-declarations", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json index aa9d3853..5b95cdb7 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/bisect.json @@ -29,6 +29,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -49,7 +50,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -90,6 +90,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -110,7 +111,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -154,6 +154,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -174,7 +175,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json index 3e4cb4bc..aa083d70 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_ftrapv_maincc_target_specific.json @@ -20,6 +20,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -41,7 +42,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -71,6 +71,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -92,7 +93,6 @@ "x86_64-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -122,6 +122,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -143,7 +144,6 @@ "x86_64-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -173,6 +173,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -194,7 +195,6 @@ "armv7m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -224,6 +224,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -245,7 +246,6 @@ "armv7m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -275,6 +275,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -296,7 +297,6 @@ "armv7m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -326,6 +326,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -347,7 +348,6 @@ "armv8m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -377,6 +377,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -398,7 +399,6 @@ "armv8m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -428,6 +428,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -449,7 +450,6 @@ "armv8m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json index 8ba250d6..257c0a05 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_maincc_target_specific.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -39,7 +40,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -68,6 +68,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -88,7 +89,6 @@ "x86_64-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -117,6 +117,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -137,7 +138,6 @@ "x86_64-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -166,6 +166,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -186,7 +187,6 @@ "armv7m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -215,6 +215,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -235,7 +236,6 @@ "armv7m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -264,6 +264,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -284,7 +285,6 @@ "armv7m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -313,6 +313,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -333,7 +334,6 @@ "armv8m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -362,6 +362,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -382,7 +383,6 @@ "armv8m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -411,6 +411,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -431,7 +432,6 @@ "armv8m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json index abf34e8b..b9edc49d 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_path.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -39,7 +40,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -71,6 +71,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -91,7 +92,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -123,6 +123,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -143,7 +144,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -175,6 +175,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -195,7 +196,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -234,6 +234,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -256,7 +257,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -298,6 +298,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -356,6 +357,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -378,7 +380,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -410,6 +411,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -430,7 +432,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -459,6 +460,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -479,7 +481,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -508,6 +509,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -528,7 +530,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -557,6 +558,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -577,7 +579,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -609,6 +610,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -629,7 +631,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json index 8ce50182..2d70dfbf 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sanitizer_args.json @@ -21,6 +21,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -41,7 +42,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -72,6 +72,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -92,7 +93,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -123,6 +123,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -143,7 +144,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -174,6 +174,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -194,7 +195,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -224,6 +224,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -245,7 +246,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -276,6 +276,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -298,7 +299,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -328,6 +328,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -348,7 +349,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -378,6 +378,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -399,7 +400,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json index eb12523b..50f71a6f 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_specific_args.json @@ -30,6 +30,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -50,7 +51,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -80,6 +80,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -101,7 +102,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -131,6 +131,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -152,7 +153,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -182,6 +182,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -203,7 +204,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -233,6 +233,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -254,7 +255,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -284,6 +284,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -305,7 +306,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -335,6 +335,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -356,7 +357,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json index 5ea9e300..b690e3ed 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clang_sysroot_wrapper_common.json @@ -54,6 +54,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -74,7 +75,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -106,6 +106,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -150,6 +151,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -168,7 +170,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -198,6 +199,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -217,7 +219,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -247,6 +248,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -266,7 +268,6 @@ "armv7a-cros-linux-gnueabihf" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -295,6 +296,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -316,7 +318,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json index dcaed1e5..26abab87 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/clangtidy.json @@ -34,6 +34,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -63,6 +64,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -122,6 +124,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -152,6 +155,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -213,6 +217,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -246,6 +251,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -308,6 +314,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -338,6 +345,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json index 87befee3..61a63a37 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/force_disable_werror.json @@ -22,6 +22,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -42,7 +43,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -74,6 +74,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -94,7 +95,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -112,6 +112,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -134,7 +135,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -168,6 +168,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -188,7 +189,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -206,6 +206,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -228,7 +229,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json index dd0a4f4d..a37725c0 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_clang_syntax.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -60,7 +61,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -92,6 +92,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -159,6 +160,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -210,6 +212,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -251,7 +254,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 a037dd10..a45c95f1 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 @@ -28,7 +28,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -65,7 +64,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -102,7 +100,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -138,7 +135,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -174,7 +170,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -210,7 +205,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -246,7 +240,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -282,7 +275,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -318,7 +310,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json index 24ad65ae..36bf222b 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_path.json @@ -28,7 +28,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -68,7 +67,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -108,7 +106,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -145,7 +142,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -182,7 +178,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -222,7 +217,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 a63aa25c..3807d8ab 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_sanitizer_args.json @@ -31,7 +31,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -71,7 +70,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -111,7 +109,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -151,7 +148,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -190,7 +186,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -231,7 +226,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -270,7 +264,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -309,7 +302,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 b7a56ce4..e8a57b2f 100644 --- a/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_hardened_golden/gcc_specific_args.json @@ -30,7 +30,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -69,7 +68,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -108,7 +106,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 c52003b7..d17707a8 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 @@ -63,7 +63,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -134,7 +133,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -171,7 +169,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -207,7 +204,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -245,7 +241,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json index aa9d3853..5b95cdb7 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/bisect.json @@ -29,6 +29,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -49,7 +50,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -90,6 +90,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -110,7 +111,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -154,6 +154,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -174,7 +175,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json index abf34e8b..b9edc49d 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clang_path.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -39,7 +40,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -71,6 +71,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -91,7 +92,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -123,6 +123,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -143,7 +144,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -175,6 +175,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -195,7 +196,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -234,6 +234,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -256,7 +257,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -298,6 +298,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -356,6 +357,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -378,7 +380,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -410,6 +411,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -430,7 +432,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -459,6 +460,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -479,7 +481,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -508,6 +509,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -528,7 +530,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -557,6 +558,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -577,7 +579,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -609,6 +610,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -629,7 +631,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json index dcaed1e5..26abab87 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/clangtidy.json @@ -34,6 +34,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -63,6 +64,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -122,6 +124,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -152,6 +155,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -213,6 +217,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -246,6 +251,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -308,6 +314,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -338,6 +345,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json index 87befee3..61a63a37 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/force_disable_werror.json @@ -22,6 +22,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -42,7 +43,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -74,6 +74,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -94,7 +95,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -112,6 +112,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -134,7 +135,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -168,6 +168,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -188,7 +189,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -206,6 +206,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -228,7 +229,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json index dd0a4f4d..a37725c0 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_clang_syntax.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -60,7 +61,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -92,6 +92,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -159,6 +160,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -210,6 +212,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -251,7 +254,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 24ad65ae..36bf222b 100644 --- a/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_hardened_llvmnext_golden/gcc_path.json @@ -28,7 +28,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -68,7 +67,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -108,7 +106,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -145,7 +142,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -182,7 +178,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -222,7 +217,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json index ca2eda8a..e9bc3661 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/bisect.json @@ -28,6 +28,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -84,6 +85,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -143,6 +145,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json index 73da7082..c21d6198 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clang_path.json @@ -18,6 +18,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -63,6 +64,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -108,6 +110,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -153,6 +156,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -205,6 +209,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -263,6 +268,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -320,6 +326,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -367,6 +374,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -409,6 +417,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -451,6 +460,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -493,6 +503,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -538,6 +549,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json index dcaed1e5..26abab87 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/clangtidy.json @@ -34,6 +34,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -63,6 +64,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -122,6 +124,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -152,6 +155,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -213,6 +217,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -246,6 +251,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -308,6 +314,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -338,6 +345,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json index 5ff4c32d..ce35f311 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/force_disable_werror.json @@ -21,6 +21,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -66,6 +67,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -97,6 +99,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -146,6 +149,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -177,6 +181,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json index 179d660f..f716dde3 100644 --- a/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_hardened_noccache_golden/gcc_clang_syntax.json @@ -19,6 +19,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -86,6 +87,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -153,6 +155,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", @@ -204,6 +207,7 @@ "-Qunused-arguments", "-grecord-gcc-switches", "-fno-addrsig", + "-fcommon", "-Wno-tautological-constant-compare", "-Wno-tautological-unsigned-enum-zero-compare", "-Wno-unknown-warning-option", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json index 77b99ce4..ce83cd72 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/bisect.json @@ -41,7 +41,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -94,7 +93,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", @@ -150,7 +148,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes", 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 74c4e854..db5bea28 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 @@ -33,7 +33,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -76,7 +75,6 @@ "x86_64-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -119,7 +117,6 @@ "x86_64-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -163,7 +160,6 @@ "armv7m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -206,7 +202,6 @@ "armv7m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -250,7 +245,6 @@ "armv7m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -294,7 +288,6 @@ "armv8m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -337,7 +330,6 @@ "armv8m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -381,7 +373,6 @@ "armv8m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 69a8188f..8b5d7088 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 @@ -31,7 +31,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -72,7 +71,6 @@ "x86_64-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -113,7 +111,6 @@ "x86_64-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -155,7 +152,6 @@ "armv7m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -196,7 +192,6 @@ "armv7m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -238,7 +233,6 @@ "armv7m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -280,7 +274,6 @@ "armv8m-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -321,7 +314,6 @@ "armv8m-cros-eabi" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -363,7 +355,6 @@ "armv8m-cros-win-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json index 51c4c05a..418f9d62 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_path.json @@ -31,7 +31,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -75,7 +74,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -119,7 +117,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -163,7 +160,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -216,7 +212,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -322,7 +317,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -366,7 +360,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -407,7 +400,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -448,7 +440,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -489,7 +480,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -533,7 +523,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 d48bebe6..54a3268c 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sanitizer_args.json @@ -34,7 +34,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -78,7 +77,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -122,7 +120,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -166,7 +163,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -210,7 +206,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -256,7 +251,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -299,7 +293,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -342,7 +335,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 3a751ed0..4a30d74e 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_specific_args.json @@ -42,7 +42,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -85,7 +84,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -128,7 +126,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -171,7 +168,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -214,7 +210,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -257,7 +252,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -300,7 +294,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 ec0bed98..8b5c8b90 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 @@ -62,7 +62,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -142,7 +141,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -186,7 +184,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -231,7 +228,6 @@ "armv7a-cros-linux-gnueabihf" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -273,7 +269,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 dea0bbf0..7aad322f 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/force_disable_werror.json @@ -34,7 +34,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -78,7 +77,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -110,7 +108,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -156,7 +153,6 @@ "x86_64-cros-linux-gnu" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" @@ -188,7 +184,6 @@ "-Wno-error=poison-system-directories" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002", "CCACHE_CPP2=yes" 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 3587b6bf..76d81fa9 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_clang_syntax.json @@ -48,7 +48,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -207,7 +206,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json index 5efa5ed6..d11a7413 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_maincc_target_specific.json @@ -24,7 +24,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -57,7 +56,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -90,7 +88,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -123,7 +120,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -155,7 +151,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -188,7 +183,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -221,7 +215,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -253,7 +246,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-eabi", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -286,7 +278,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv8m-cros-win-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json index 92a261ce..17483eee 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_path.json @@ -24,7 +24,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -60,7 +59,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -96,7 +94,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -129,7 +126,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -162,7 +158,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/tmp/stable/a/b/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -198,7 +193,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json index 7091f608..4aacc51a 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sanitizer_args.json @@ -27,7 +27,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -63,7 +62,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -99,7 +97,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -135,7 +132,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -170,7 +166,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -207,7 +202,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -242,7 +236,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -277,7 +270,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] 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 6e519429..c2f7cd07 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_specific_args.json @@ -26,7 +26,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -61,7 +60,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -96,7 +94,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json index a3cfc34a..be2df4cf 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json @@ -55,7 +55,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -120,7 +119,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -156,7 +154,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -192,7 +189,6 @@ "main.cc" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] @@ -226,7 +222,6 @@ "-mno-movbe" ], "env_updates": [ - "CCACHE_BASEDIR=/usr/x86_64-cros-linux-gnu", "CCACHE_DIR=/var/cache/distfiles/ccache", "CCACHE_UMASK=002" ] diff --git a/cros_utils/tabulator.py b/cros_utils/tabulator.py index 5029ceee..3d5f2aed 100644 --- a/cros_utils/tabulator.py +++ b/cros_utils/tabulator.py @@ -64,6 +64,7 @@ table: from __future__ import division from __future__ import print_function +import collections import getpass import math import sys @@ -112,21 +113,22 @@ class TableGenerator(object): SORT_BY_KEYS_DESC = 1 SORT_BY_VALUES = 2 SORT_BY_VALUES_DESC = 3 + NO_SORT = 4 MISSING_VALUE = 'x' - def __init__(self, d, l, sort=SORT_BY_KEYS, key_name='keys'): + def __init__(self, d, l, sort=NO_SORT, key_name='keys'): self._runs = d self._labels = l self._sort = sort self._key_name = key_name def _AggregateKeys(self): - keys = set([]) + keys = collections.OrderedDict() for run_list in self._runs: for run in run_list: - keys = keys.union(run.keys()) - return keys + keys.update(dict.fromkeys(run.keys())) + return list(keys.keys()) def _GetHighestValue(self, key): values = [] @@ -159,6 +161,8 @@ class TableGenerator(object): elif self._sort == self.SORT_BY_VALUES_DESC: # pylint: disable=unnecessary-lambda return sorted(keys, key=lambda x: self._GetHighestValue(x), reverse=True) + elif self._sort == self.NO_SORT: + return keys else: assert 0, 'Unimplemented sort %s' % self._sort diff --git a/llvm_tools/README.md b/llvm_tools/README.md index 5d27a962..07c11651 100644 --- a/llvm_tools/README.md +++ b/llvm_tools/README.md @@ -471,6 +471,23 @@ from get_llvm_hash import GetGoogle3LLVMVersion GetGoogle3LLVMVersion(stable=True) ``` +### `git_llvm_rev.py` + +This script is meant to synthesize LLVM revision numbers, and translate between +these synthesized numbers and git SHAs. Usage should be straightforward: + +``` +~> ./git_llvm_rev.py --llvm_dir llvm-project-copy/ --rev r380000 +6f635f90929da9545dd696071a829a1a42f84b30 +~> ./git_llvm_rev.py --llvm_dir llvm-project-copy/ --sha 6f635f90929da9545dd696071a829a1a42f84b30 +r380000 +~> ./git_llvm_rev.py --llvm_dir llvm-project-copy/ --sha origin/master +r387778 +``` + +**Tip**: if you put a symlink called `git-llvm-rev` to this script somewhere on +your `$PATH`, you can also use it as `git llvm-rev`. + ### `cherrypick_cl.py` #### Usage |