From f547046850010e726dc179340fcc8b7b5c470155 Mon Sep 17 00:00:00 2001 From: Jeremy Faller Date: Fri, 19 Jun 2020 15:19:59 -0400 Subject: [PATCH] [dev.link] cmd/link: rescope Datblk to datblk Change should be non-functional. Change-Id: I8ac835762a1aa6458d896b8815cd2d87333b55ab Reviewed-on: https://go-review.googlesource.com/c/go/+/239279 Run-TryBot: Jeremy Faller TryBot-Result: Gobot Gobot Reviewed-by: Than McIntosh --- src/cmd/link/internal/ld/asmb.go | 10 +++++----- src/cmd/link/internal/ld/data.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cmd/link/internal/ld/asmb.go b/src/cmd/link/internal/ld/asmb.go index d4e358cebc..216e9b6cc4 100644 --- a/src/cmd/link/internal/ld/asmb.go +++ b/src/cmd/link/internal/ld/asmb.go @@ -45,7 +45,7 @@ func asmb(ctxt *Link) { writeParallel(&wg, f, ctxt, offset, sect.Vaddr, sect.Length) for _, sect := range Segtext.Sections[1:] { offset := sect.Vaddr - Segtext.Vaddr + Segtext.Fileoff - writeParallel(&wg, Datblk, ctxt, offset, sect.Vaddr, sect.Length) + writeParallel(&wg, datblk, ctxt, offset, sect.Vaddr, sect.Length) } } else { // TODO why can't we handle all sections this way? @@ -55,20 +55,20 @@ func asmb(ctxt *Link) { if sect.Name == ".text" { writeParallel(&wg, f, ctxt, offset, sect.Vaddr, sect.Length) } else { - writeParallel(&wg, Datblk, ctxt, offset, sect.Vaddr, sect.Length) + writeParallel(&wg, datblk, ctxt, offset, sect.Vaddr, sect.Length) } } } if Segrodata.Filelen > 0 { - writeParallel(&wg, Datblk, ctxt, Segrodata.Fileoff, Segrodata.Vaddr, Segrodata.Filelen) + writeParallel(&wg, datblk, ctxt, Segrodata.Fileoff, Segrodata.Vaddr, Segrodata.Filelen) } if Segrelrodata.Filelen > 0 { - writeParallel(&wg, Datblk, ctxt, Segrelrodata.Fileoff, Segrelrodata.Vaddr, Segrelrodata.Filelen) + writeParallel(&wg, datblk, ctxt, Segrelrodata.Fileoff, Segrelrodata.Vaddr, Segrelrodata.Filelen) } - writeParallel(&wg, Datblk, ctxt, Segdata.Fileoff, Segdata.Vaddr, Segdata.Filelen) + writeParallel(&wg, datblk, ctxt, Segdata.Fileoff, Segdata.Vaddr, Segdata.Filelen) writeParallel(&wg, dwarfblk, ctxt, Segdwarf.Fileoff, Segdwarf.Vaddr, Segdwarf.Filelen) diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index ed7129a156..5234a2406a 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -928,7 +928,7 @@ func writeParallel(wg *sync.WaitGroup, fn writeFn, ctxt *Link, seek, vaddr, leng } } -func Datblk(ctxt *Link, out *OutBuf, addr, size int64) { +func datblk(ctxt *Link, out *OutBuf, addr, size int64) { writeDatblkToOutBuf(ctxt, out, addr, size) } -- 2.48.1