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

Merge "Use -fdebug-default-version=4 for assembly files" am: 49fc44f6b2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2120563

Change-Id: Ibac6d479c1f18b0d0185357706e7e07bb70c718f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Colin Cross
2022-06-10 19:45:41 +00:00
committed by Automerger Merge Worker
parent 28b9607224 49fc44f6b2
commit 96aad8abcf
2 changed files with 5 additions and 1 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__"}, expectedIncludes, lastIncludes), expected: combineSlices(baseExpectedFlags, []string{"-D__ASSEMBLY__", "-fdebug-default-version=4"}, expectedIncludes, lastIncludes),
}, },
} }

4
cc/compiler.go
View File

@@ -495,6 +495,10 @@ 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, "-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.
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())
flags.Global.YasmFlags = append(flags.Global.YasmFlags, tc.YasmFlags()) flags.Global.YasmFlags = append(flags.Global.YasmFlags, tc.YasmFlags())