cmd/link: rename ELF struct fields to remove "elf" prefix

While we're here rename setupplt to setupPLT.

This is a pure naming change with no semantic change.

Change-Id: Ib0312fb6568475b620dab7632438b4d25e4d9cc0
Reviewed-on: https://go-review.googlesource.com/c/go/+/463744
Reviewed-by: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Auto-Submit: Ian Lance Taylor <iant@golang.org>

diff --git a/src/cmd/link/internal/amd64/obj.go b/src/cmd/link/internal/amd64/obj.go
index 3bc0fef196f769cfe7ba9aac23218fd23501eb97..b99cdbc356252ab78aac3bfddb23878cdc3c03a1 100644 (file)
--- a/src/cmd/link/internal/amd64/obj.go
+++ b/src/cmd/link/internal/amd64/obj.go
@@ -70,9 +70,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "/usr/libexec/ld-elf.so.2",
                        Solarisdynld:   "/lib/amd64/ld.so.1",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/arm/obj.go b/src/cmd/link/internal/arm/obj.go
index cb1a269c0f3f979471079deb0ca3097b92948a80..52fd5b652363982735c933c73b979c0009ffeb2a 100644 (file)
--- a/src/cmd/link/internal/arm/obj.go
+++ b/src/cmd/link/internal/arm/obj.go
@@ -68,9 +68,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 8,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 8,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/arm64/obj.go b/src/cmd/link/internal/arm64/obj.go
index d068f8ef801b749e7d246b42f5e4f5a825a25fa0..34b693ed6c8cf7dd5108a7b1d3cf824d70acff4d 100644 (file)
--- a/src/cmd/link/internal/arm64/obj.go
+++ b/src/cmd/link/internal/arm64/obj.go
@@ -70,9 +70,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
index 2c6ea643fc76529bb18a1fd48f1e1e5cabf80e1f..954aaaff16643f9507dbc8803d5a126c41eccdc7 100644 (file)
--- a/src/cmd/link/internal/ld/elf.go
+++ b/src/cmd/link/internal/ld/elf.go
@@ -206,9 +206,9 @@ type ELFArch struct {
        Dragonflydynld string
        Solarisdynld   string
 
-       Elfreloc1    func(*Link, *OutBuf, *loader.Loader, loader.Sym, loader.ExtReloc, int, int64) bool
-       ElfrelocSize uint32 // size of an ELF relocation record, must match Elfreloc1.
-       Elfsetupplt  func(ctxt *Link, plt, gotplt *loader.SymbolBuilder, dynamic loader.Sym)
+       Reloc1    func(*Link, *OutBuf, *loader.Loader, loader.Sym, loader.ExtReloc, int, int64) bool
+       RelocSize uint32 // size of an ELF relocation record, must match Reloc1.
+       SetupPLT  func(ctxt *Link, plt, gotplt *loader.SymbolBuilder, dynamic loader.Sym)
 
        // DynamicReadOnly can be set to true to make the .dynamic
        // section read-only. By default it is writable.
@@ -1289,8 +1289,8 @@ func elfrelocsect(ctxt *Link, out *OutBuf, sect *sym.Section, syms []loader.Sym)
                        break
                }
 
-               // Compute external relocations on the go, and pass to Elfreloc1
-               // to stream out.
+               // Compute external relocations on the go, and pass to
+               // ELF.Reloc1 to stream out.
                relocs := ldr.Relocs(s)
                for ri := 0; ri < relocs.Count(); ri++ {
                        r := relocs.At(ri)
@@ -1309,7 +1309,7 @@ func elfrelocsect(ctxt *Link, out *OutBuf, sect *sym.Section, syms []loader.Sym)
                        if !ldr.AttrReachable(rr.Xsym) {
                                ldr.Errorf(s, "unreachable reloc %d (%s) target %v", r.Type(), sym.RelocName(ctxt.Arch, r.Type()), ldr.SymName(rr.Xsym))
                        }
-                       if !thearch.ELF.Elfreloc1(ctxt, out, ldr, s, rr, ri, int64(uint64(ldr.SymValue(s)+int64(r.Off()))-sect.Vaddr)) {
+                       if !thearch.ELF.Reloc1(ctxt, out, ldr, s, rr, ri, int64(uint64(ldr.SymValue(s)+int64(r.Off()))-sect.Vaddr)) {
                                ldr.Errorf(s, "unsupported obj reloc %d (%s)/%d to %s", r.Type(), sym.RelocName(ctxt.Arch, r.Type()), r.Siz(), ldr.SymName(r.Sym()))
                        }
                }
@@ -1326,7 +1326,7 @@ func elfEmitReloc(ctxt *Link) {
                ctxt.Out.Write8(0)
        }
 
-       sizeExtRelocs(ctxt, thearch.ELF.ElfrelocSize)
+       sizeExtRelocs(ctxt, thearch.ELF.RelocSize)
        relocSect, wg := relocSectFn(ctxt, elfrelocsect)
 
        for _, sect := range Segtext.Sections {
@@ -1578,7 +1578,7 @@ func (ctxt *Link) doelf() {
                        // S390X uses .got instead of .got.plt
                        gotplt = got
                }
-               thearch.ELF.Elfsetupplt(ctxt, plt, gotplt, dynamic.Sym())
+               thearch.ELF.SetupPLT(ctxt, plt, gotplt, dynamic.Sym())
 
                /*
                 * .dynamic table

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 17df56f4d53189591a747ab57ffb2527347a80a4..ffa2d835051ef10a94e182a301d47f8eae4bce2b 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -200,7 +200,7 @@ type Arch struct {
        // is the contents of the to-be-relocated data item (from sym.P). Return
        // value is the appropriately relocated value (to be written back to the
        // same spot in sym.P), number of external _host_ relocations needed (i.e.
-       // ELF/Mach-O/etc. relocations, not Go relocations, this must match Elfreloc1,
+       // ELF/Mach-O/etc. relocations, not Go relocations, this must match ELF.Reloc1,
        // etc.), and a boolean indicating success/failure (a failing value indicates
        // a fatal error).
        Archreloc func(*Target, *loader.Loader, *ArchSyms, loader.Reloc, loader.Sym,

diff --git a/src/cmd/link/internal/loong64/obj.go b/src/cmd/link/internal/loong64/obj.go
index e99dbe5c8d5e949827f06d0557378f1464cdb816..0f2ca2ebc700f26b42854f2c0e13cd2d300a45c6 100644 (file)
--- a/src/cmd/link/internal/loong64/obj.go
+++ b/src/cmd/link/internal/loong64/obj.go
@@ -36,9 +36,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/mips/obj.go b/src/cmd/link/internal/mips/obj.go
index 61c22d986fc4576a0d378c6da54c56723aaaf9a8..0139d541df665f92d045e19c40ad9934e64bf7de 100644 (file)
--- a/src/cmd/link/internal/mips/obj.go
+++ b/src/cmd/link/internal/mips/obj.go
@@ -69,9 +69,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 8,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 8,
+                       SetupPLT:  elfsetupplt,
 
                        // Historically GNU ld creates a read-only
                        // .dynamic section.

diff --git a/src/cmd/link/internal/mips64/obj.go b/src/cmd/link/internal/mips64/obj.go
index ce4494c61d9cb6a156e4fc1a7fff9ec71a669b7a..59afb250950cb4eaddfc3781c402d2748f555c67 100644 (file)
--- a/src/cmd/link/internal/mips64/obj.go
+++ b/src/cmd/link/internal/mips64/obj.go
@@ -67,9 +67,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
 
                        // Historically GNU ld creates a read-only
                        // .dynamic section.

diff --git a/src/cmd/link/internal/ppc64/obj.go b/src/cmd/link/internal/ppc64/obj.go
index 16cd4fc20cda82a71b6cc8acde7dba2be8b48b66..3fc6622bffc0ccc2068ab93f8be27523cf12c737 100644 (file)
--- a/src/cmd/link/internal/ppc64/obj.go
+++ b/src/cmd/link/internal/ppc64/obj.go
@@ -76,9 +76,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/riscv64/obj.go b/src/cmd/link/internal/riscv64/obj.go
index 28fa7747d653c611ab419482d5dbce5da94dec9d..6230bd69af9ed09a24516fde01fd245c8e9a79e3 100644 (file)
--- a/src/cmd/link/internal/riscv64/obj.go
+++ b/src/cmd/link/internal/riscv64/obj.go
@@ -45,9 +45,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/s390x/obj.go b/src/cmd/link/internal/s390x/obj.go
index df06b952bc2be412f0aec65010f2cb8b79e7eebc..c2386fb9e9232b7d2ab4b997fd5dde8f2f50e536 100644 (file)
--- a/src/cmd/link/internal/s390x/obj.go
+++ b/src/cmd/link/internal/s390x/obj.go
@@ -64,9 +64,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Dragonflydynld: "XXX",
                        Solarisdynld:   "XXX",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 24,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 24,
+                       SetupPLT:  elfsetupplt,
                },
        }
 

diff --git a/src/cmd/link/internal/x86/obj.go b/src/cmd/link/internal/x86/obj.go
index 9c62bd76336ce208066cfd3ea246bf0cf74f4acd..6ccb8e093f322bc1626210c9b9b13c68336e0750 100644 (file)
--- a/src/cmd/link/internal/x86/obj.go
+++ b/src/cmd/link/internal/x86/obj.go
@@ -66,9 +66,9 @@ func Init() (*sys.Arch, ld.Arch) {
                        Netbsddynld:    "/usr/libexec/ld.elf_so",
                        Solarisdynld:   "/lib/ld.so.1",
 
-                       Elfreloc1:    elfreloc1,
-                       ElfrelocSize: 8,
-                       Elfsetupplt:  elfsetupplt,
+                       Reloc1:    elfreloc1,
+                       RelocSize: 8,
+                       SetupPLT:  elfsetupplt,
                },
        }