Skip to content

Commit 0f485c5

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 72b588d + 47ab9cb commit 0f485c5

File tree

4 files changed

+1371
-0
lines changed

4 files changed

+1371
-0
lines changed

src/cmd/asm/main.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ func main() {
4949
ctxt.Debugpcln = flags.DebugFlags.PCTab
5050
ctxt.IsAsm = true
5151
ctxt.Pkgpath = *flags.Importpath
52+
ctxt.DwTextCount = objabi.DummyDwarfFunctionCountForAssembler()
5253
switch *flags.Spectre {
5354
default:
5455
log.Printf("unknown setting -spectre=%s", *flags.Spectre)

src/cmd/compile/internal/ssagen/abi.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ func (s *SymABIs) ReadSymABIs(file string) {
8989
// Record for later.
9090
if parts[0] == "def" {
9191
s.defs[sym] = abi
92+
base.Ctxt.DwTextCount++
9293
} else {
9394
s.refs[sym] |= obj.ABISetOf(abi)
9495
}

0 commit comments

Comments
 (0)