StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move global asflags to config to share with Bazel

Browse Source 
Test: CI
Change-Id: Ib76bd63f9d021f581b232522d1206d968d7b1599
This commit is contained in:
Liz Kammer
2022-06-22 21:02:08 +00:00
parent 061d352801
commit e4d1bdaa57
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cc/cc_test.go
View File

@@ -4076,7 +4076,7 @@ func TestIncludeDirectoryOrdering(t *testing.T) {
{ {
name: "assemble", name: "assemble",
src: "foo.s", src: "foo.s",
expected: combineSlices(baseExpectedFlags, []string{"-D__ASSEMBLY__", "-fdebug-default-version=4"}, expectedIncludes, lastIncludes), expected: combineSlices(baseExpectedFlags, []string{"${config.CommonGlobalAsflags}"}, expectedIncludes, lastIncludes),
}, },
} }

6
cc/compiler.go
View File

@@ -493,11 +493,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
} }
} }
flags.Global.AsFlags = append(flags.Global.AsFlags, "-D__ASSEMBLY__") flags.Global.AsFlags = append(flags.Global.AsFlags, "${config.CommonGlobalAsflags}")
// TODO(b/235105792): override global -fdebug-default-version=5, it is causing $TMPDIR to
// end up in the dwarf data for crtend_so.S.
flags.Global.AsFlags = append(flags.Global.AsFlags, "-fdebug-default-version=4")
flags.Global.CppFlags = append(flags.Global.CppFlags, tc.Cppflags()) flags.Global.CppFlags = append(flags.Global.CppFlags, tc.Cppflags())

8
cc/config/global.go
View File

@@ -117,6 +117,13 @@ var (
commonGlobalConlyflags = []string{} commonGlobalConlyflags = []string{}
commonGlobalAsflags = []string{
"-D__ASSEMBLY__",
// TODO(b/235105792): override global -fdebug-default-version=5, it is causing $TMPDIR to
// end up in the dwarf data for crtend_so.S.
"-fdebug-default-version=4",
}
deviceGlobalCflags = []string{ deviceGlobalCflags = []string{
"-ffunction-sections", "-ffunction-sections",
"-fdata-sections", "-fdata-sections",
@@ -313,6 +320,7 @@ func init() {
} }
exportedVars.ExportStringListStaticVariable("CommonGlobalConlyflags", commonGlobalConlyflags) exportedVars.ExportStringListStaticVariable("CommonGlobalConlyflags", commonGlobalConlyflags)
exportedVars.ExportStringListStaticVariable("CommonGlobalAsflags", commonGlobalAsflags)
exportedVars.ExportStringListStaticVariable("DeviceGlobalCppflags", deviceGlobalCppflags) exportedVars.ExportStringListStaticVariable("DeviceGlobalCppflags", deviceGlobalCppflags)
exportedVars.ExportStringListStaticVariable("DeviceGlobalLdflags", deviceGlobalLdflags) exportedVars.ExportStringListStaticVariable("DeviceGlobalLdflags", deviceGlobalLdflags)
exportedVars.ExportStringListStaticVariable("DeviceGlobalLldflags", deviceGlobalLldflags) exportedVars.ExportStringListStaticVariable("DeviceGlobalLldflags", deviceGlobalLldflags)