Skip to content

G
go
Commit 5d95de20 authored by David Crawshaw's avatar David Crawshaw
Browse files
Options

cmd/link: remove SysArch global variable 

For #22095

Change-Id: I9d1f0d93f8fd701a24af826dc903eea2bc235de2
Reviewed-on: https://go-review.googlesource.com/67317
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarIan Lance Taylor <iant@golang.org>
parent 0a7ef31d
Show whitespace changes
Inline Side-by-side
Showing with 702 additions and 676 deletions
src/cmd/link/internal/amd64/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package amd64 ...@@ -32,6 +32,7 @@ package amd64
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"debug/elf" "debug/elf"
"log" "log"
...@@ -102,7 +103,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -102,7 +103,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
switch r.Type { switch r.Type {
default: default:
if r.Type >= 256 { if r.Type >= 256 {
ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
return false return false
} }
...@@ -330,7 +331,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -330,7 +331,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
return true return true
} }
if ld.Headtype == objabi.Hdarwin && s.Size == int64(ld.SysArch.PtrSize) && r.Off == 0 { if ld.Headtype == objabi.Hdarwin && s.Size == int64(ctxt.Arch.PtrSize) && r.Off == 0 {
// Mach-O relocations are a royal pain to lay out. // Mach-O relocations are a royal pain to lay out.
// They use a compact stateful bytecode representation // They use a compact stateful bytecode representation
// that is too much bother to deal with. // that is too much bother to deal with.
...@@ -422,14 +423,14 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -422,14 +423,14 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return true return true
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_PCREL || r.Type == objabi.R_GOTPCREL { if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_PCREL || r.Type == objabi.R_GOTPCREL {
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
...@@ -438,7 +439,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -438,7 +439,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
} else { } else {
v = uint32(rs.Sect.Extnum) v = uint32(rs.Sect.Extnum)
if v == 0 { if v == 0 {
ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type)
return false return false
} }
} }
...@@ -485,13 +486,13 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -485,13 +486,13 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return true return true
} }
func pereloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-coff symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-coff symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
......
src/cmd/link/internal/amd64/obj.go
View file @ 5d95de20
...@@ -37,42 +37,46 @@ import ( ...@@ -37,42 +37,46 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
ld.SysArch = sys.ArchAMD64 arch := sys.ArchAMD64
if objabi.GOARCH == "amd64p32" { if objabi.GOARCH == "amd64p32" {
ld.SysArch = sys.ArchAMD64P32 arch = sys.ArchAMD64P32
} }
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit Adddynrel: adddynrel,
ld.Thearch.Archreloc = archreloc Archinit: archinit,
ld.Thearch.Archrelocvariant = archrelocvariant Archreloc: archreloc,
ld.Thearch.Asmb = asmb Archrelocvariant: archrelocvariant,
ld.Thearch.Elfreloc1 = elfreloc1 Asmb: asmb,
ld.Thearch.Elfsetupplt = elfsetupplt Elfreloc1: elfreloc1,
ld.Thearch.Gentext = gentext Elfsetupplt: elfsetupplt,
ld.Thearch.Machoreloc1 = machoreloc1 Gentext: gentext,
ld.Thearch.PEreloc1 = pereloc1 Machoreloc1: machoreloc1,
ld.Thearch.Lput = ld.Lputl PEreloc1: pereloc1,
ld.Thearch.Wput = ld.Wputl Lput: ld.Lputl,
ld.Thearch.Vput = ld.Vputl Wput: ld.Wputl,
ld.Thearch.Append16 = ld.Append16l Vput: ld.Vputl,
ld.Thearch.Append32 = ld.Append32l Append16: ld.Append16l,
ld.Thearch.Append64 = ld.Append64l Append32: ld.Append32l,
ld.Thearch.TLSIEtoLE = tlsIEtoLE Append64: ld.Append64l,
TLSIEtoLE: tlsIEtoLE,
ld.Thearch.Linuxdynld = "/lib64/ld-linux-x86-64.so.2"
ld.Thearch.Freebsddynld = "/libexec/ld-elf.so.1" Linuxdynld: "/lib64/ld-linux-x86-64.so.2",
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" Freebsddynld: "/libexec/ld-elf.so.1",
ld.Thearch.Netbsddynld = "/libexec/ld.elf_so" Openbsddynld: "/usr/libexec/ld.so",
ld.Thearch.Dragonflydynld = "/usr/libexec/ld-elf.so.2" Netbsddynld: "/libexec/ld.elf_so",
ld.Thearch.Solarisdynld = "/lib/amd64/ld.so.1" Dragonflydynld: "/usr/libexec/ld-elf.so.2",
Solarisdynld: "/lib/amd64/ld.so.1",
}
return arch, theArch
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
...@@ -94,8 +98,6 @@ func archinit(ctxt *ld.Link) { ...@@ -94,8 +98,6 @@ func archinit(ctxt *ld.Link) {
} }
case objabi.Hdarwin: /* apple MACH */ case objabi.Hdarwin: /* apple MACH */
ld.Machoinit()
ld.HEADR = ld.INITIAL_MACHO_HEADR ld.HEADR = ld.INITIAL_MACHO_HEADR
if *ld.FlagRound == -1 { if *ld.FlagRound == -1 {
*ld.FlagRound = 4096 *ld.FlagRound = 4096
......
src/cmd/link/internal/arm/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package arm ...@@ -32,6 +32,7 @@ package arm
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"fmt" "fmt"
"log" "log"
...@@ -118,7 +119,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -118,7 +119,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
switch r.Type { switch r.Type {
default: default:
if r.Type >= 256 { if r.Type >= 256 {
ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
return false return false
} }
...@@ -320,7 +321,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -320,7 +321,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -357,7 +358,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -357,7 +358,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_CALLARM { if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_CALLARM {
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
...@@ -366,7 +367,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -366,7 +367,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
} else { } else {
v = uint32(rs.Sect.Extnum) v = uint32(rs.Sect.Extnum)
if v == 0 { if v == 0 {
ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type)
return false return false
} }
} }
...@@ -461,11 +462,11 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) { ...@@ -461,11 +462,11 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) {
if immrot(uint32(offset)) == 0 { if immrot(uint32(offset)) == 0 {
ld.Errorf(s, "odd offset in dynlink direct call: %v+%d", r.Sym, offset) ld.Errorf(s, "odd offset in dynlink direct call: %v+%d", r.Sym, offset)
} }
gentrampdyn(tramp, r.Sym, int64(offset)) gentrampdyn(ctxt.Arch, tramp, r.Sym, int64(offset))
} else if ld.Buildmode == ld.BuildmodeCArchive || ld.Buildmode == ld.BuildmodeCShared || ld.Buildmode == ld.BuildmodePIE { } else if ld.Buildmode == ld.BuildmodeCArchive || ld.Buildmode == ld.BuildmodeCShared || ld.Buildmode == ld.BuildmodePIE {
gentramppic(tramp, r.Sym, int64(offset)) gentramppic(ctxt.Arch, tramp, r.Sym, int64(offset))
} else { } else {
gentramp(tramp, r.Sym, int64(offset)) gentramp(ctxt.Arch, tramp, r.Sym, int64(offset))
} }
} }
// modify reloc to point to tramp, which will be resolved later // modify reloc to point to tramp, which will be resolved later
...@@ -474,21 +475,21 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) { ...@@ -474,21 +475,21 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) {
r.Done = false r.Done = false
} }
default: default:
ld.Errorf(s, "trampoline called with non-jump reloc: %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "trampoline called with non-jump reloc: %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
} }
} }
// generate a trampoline to target+offset // generate a trampoline to target+offset
func gentramp(tramp, target *ld.Symbol, offset int64) { func gentramp(arch *sys.Arch, tramp, target *ld.Symbol, offset int64) {
tramp.Size = 12 // 3 instructions tramp.Size = 12 // 3 instructions
tramp.P = make([]byte, tramp.Size) tramp.P = make([]byte, tramp.Size)
t := ld.Symaddr(target) + int64(offset) t := ld.Symaddr(target) + int64(offset)
o1 := uint32(0xe5900000 | 11<<12 | 15<<16) // MOVW (R15), R11 // R15 is actual pc + 8 o1 := uint32(0xe5900000 | 11<<12 | 15<<16) // MOVW (R15), R11 // R15 is actual pc + 8
o2 := uint32(0xe12fff10 | 11) // JMP (R11) o2 := uint32(0xe12fff10 | 11) // JMP (R11)
o3 := uint32(t) // WORD $target o3 := uint32(t) // WORD $target
ld.SysArch.ByteOrder.PutUint32(tramp.P, o1) arch.ByteOrder.PutUint32(tramp.P, o1)
ld.SysArch.ByteOrder.PutUint32(tramp.P[4:], o2) arch.ByteOrder.PutUint32(tramp.P[4:], o2)
ld.SysArch.ByteOrder.PutUint32(tramp.P[8:], o3) arch.ByteOrder.PutUint32(tramp.P[8:], o3)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
r := ld.Addrel(tramp) r := ld.Addrel(tramp)
...@@ -501,17 +502,17 @@ func gentramp(tramp, target *ld.Symbol, offset int64) { ...@@ -501,17 +502,17 @@ func gentramp(tramp, target *ld.Symbol, offset int64) {
} }
// generate a trampoline to target+offset in position independent code // generate a trampoline to target+offset in position independent code
func gentramppic(tramp, target *ld.Symbol, offset int64) { func gentramppic(arch *sys.Arch, tramp, target *ld.Symbol, offset int64) {
tramp.Size = 16 // 4 instructions tramp.Size = 16 // 4 instructions
tramp.P = make([]byte, tramp.Size) tramp.P = make([]byte, tramp.Size)
o1 := uint32(0xe5900000 | 11<<12 | 15<<16 | 4) // MOVW 4(R15), R11 // R15 is actual pc + 8 o1 := uint32(0xe5900000 | 11<<12 | 15<<16 | 4) // MOVW 4(R15), R11 // R15 is actual pc + 8
o2 := uint32(0xe0800000 | 11<<12 | 15<<16 | 11) // ADD R15, R11, R11 o2 := uint32(0xe0800000 | 11<<12 | 15<<16 | 11) // ADD R15, R11, R11
o3 := uint32(0xe12fff10 | 11) // JMP (R11) o3 := uint32(0xe12fff10 | 11) // JMP (R11)
o4 := uint32(0) // WORD $(target-pc) // filled in with relocation o4 := uint32(0) // WORD $(target-pc) // filled in with relocation
ld.SysArch.ByteOrder.PutUint32(tramp.P, o1) arch.ByteOrder.PutUint32(tramp.P, o1)
ld.SysArch.ByteOrder.PutUint32(tramp.P[4:], o2) arch.ByteOrder.PutUint32(tramp.P[4:], o2)
ld.SysArch.ByteOrder.PutUint32(tramp.P[8:], o3) arch.ByteOrder.PutUint32(tramp.P[8:], o3)
ld.SysArch.ByteOrder.PutUint32(tramp.P[12:], o4) arch.ByteOrder.PutUint32(tramp.P[12:], o4)
r := ld.Addrel(tramp) r := ld.Addrel(tramp)
r.Off = 12 r.Off = 12
...@@ -522,7 +523,7 @@ func gentramppic(tramp, target *ld.Symbol, offset int64) { ...@@ -522,7 +523,7 @@ func gentramppic(tramp, target *ld.Symbol, offset int64) {
} }
// generate a trampoline to target+offset in dynlink mode (using GOT) // generate a trampoline to target+offset in dynlink mode (using GOT)
func gentrampdyn(tramp, target *ld.Symbol, offset int64) { func gentrampdyn(arch *sys.Arch, tramp, target *ld.Symbol, offset int64) {
tramp.Size = 20 // 5 instructions tramp.Size = 20 // 5 instructions
o1 := uint32(0xe5900000 | 11<<12 | 15<<16 | 8) // MOVW 8(R15), R11 // R15 is actual pc + 8 o1 := uint32(0xe5900000 | 11<<12 | 15<<16 | 8) // MOVW 8(R15), R11 // R15 is actual pc + 8
o2 := uint32(0xe0800000 | 11<<12 | 15<<16 | 11) // ADD R15, R11, R11 o2 := uint32(0xe0800000 | 11<<12 | 15<<16 | 11) // ADD R15, R11, R11
...@@ -539,13 +540,13 @@ func gentrampdyn(tramp, target *ld.Symbol, offset int64) { ...@@ -539,13 +540,13 @@ func gentrampdyn(tramp, target *ld.Symbol, offset int64) {
o1 = uint32(0xe5900000 | 11<<12 | 15<<16 | 12) // MOVW 12(R15), R11 o1 = uint32(0xe5900000 | 11<<12 | 15<<16 | 12) // MOVW 12(R15), R11
} }
tramp.P = make([]byte, tramp.Size) tramp.P = make([]byte, tramp.Size)
ld.SysArch.ByteOrder.PutUint32(tramp.P, o1) arch.ByteOrder.PutUint32(tramp.P, o1)
ld.SysArch.ByteOrder.PutUint32(tramp.P[4:], o2) arch.ByteOrder.PutUint32(tramp.P[4:], o2)
ld.SysArch.ByteOrder.PutUint32(tramp.P[8:], o3) arch.ByteOrder.PutUint32(tramp.P[8:], o3)
ld.SysArch.ByteOrder.PutUint32(tramp.P[12:], o4) arch.ByteOrder.PutUint32(tramp.P[12:], o4)
ld.SysArch.ByteOrder.PutUint32(tramp.P[16:], o5) arch.ByteOrder.PutUint32(tramp.P[16:], o5)
if offset != 0 { if offset != 0 {
ld.SysArch.ByteOrder.PutUint32(tramp.P[20:], o6) arch.ByteOrder.PutUint32(tramp.P[20:], o6)
} }
r := ld.Addrel(tramp) r := ld.Addrel(tramp)
......
src/cmd/link/internal/arm/obj.go
View file @ 5d95de20
...@@ -37,38 +37,42 @@ import ( ...@@ -37,38 +37,42 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
ld.SysArch = sys.ArchARM arch := sys.ArchARM
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel Adddynrel: adddynrel,
ld.Thearch.Archinit = archinit Archinit: archinit,
ld.Thearch.Archreloc = archreloc Archreloc: archreloc,
ld.Thearch.Archrelocvariant = archrelocvariant Archrelocvariant: archrelocvariant,
ld.Thearch.Trampoline = trampoline Trampoline: trampoline,
ld.Thearch.Asmb = asmb Asmb: asmb,
ld.Thearch.Elfreloc1 = elfreloc1 Elfreloc1: elfreloc1,
ld.Thearch.Elfsetupplt = elfsetupplt Elfsetupplt: elfsetupplt,
ld.Thearch.Gentext = gentext Gentext: gentext,
ld.Thearch.Machoreloc1 = machoreloc1 Machoreloc1: machoreloc1,
ld.Thearch.Lput = ld.Lputl Lput: ld.Lputl,
ld.Thearch.Wput = ld.Wputl Wput: ld.Wputl,
ld.Thearch.Vput = ld.Vputl Vput: ld.Vputl,
ld.Thearch.Append16 = ld.Append16l Append16: ld.Append16l,
ld.Thearch.Append32 = ld.Append32l Append32: ld.Append32l,
ld.Thearch.Append64 = ld.Append64l Append64: ld.Append64l,
ld.Thearch.Linuxdynld = "/lib/ld-linux.so.3" // 2 for OABI, 3 for EABI Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI
ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1" Freebsddynld: "/usr/libexec/ld-elf.so.1",
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" Openbsddynld: "/usr/libexec/ld.so",
ld.Thearch.Netbsddynld = "/libexec/ld.elf_so" Netbsddynld: "/libexec/ld.elf_so",
ld.Thearch.Dragonflydynld = "XXX" Dragonflydynld: "XXX",
ld.Thearch.Solarisdynld = "XXX" Solarisdynld: "XXX",
}
return arch, theArch
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
...@@ -123,7 +127,6 @@ func archinit(ctxt *ld.Link) { ...@@ -123,7 +127,6 @@ func archinit(ctxt *ld.Link) {
case objabi.Hdarwin: /* apple MACH */ case objabi.Hdarwin: /* apple MACH */
*ld.FlagW = true // disable DWARF generation *ld.FlagW = true // disable DWARF generation
ld.Machoinit()
ld.HEADR = ld.INITIAL_MACHO_HEADR ld.HEADR = ld.INITIAL_MACHO_HEADR
if *ld.FlagTextAddr == -1 { if *ld.FlagTextAddr == -1 {
*ld.FlagTextAddr = 4096 + int64(ld.HEADR) *ld.FlagTextAddr = 4096 + int64(ld.HEADR)
......
src/cmd/link/internal/arm64/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package arm64 ...@@ -32,6 +32,7 @@ package arm64
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
...@@ -142,7 +143,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -142,7 +143,7 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -152,7 +153,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -152,7 +153,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
// UNSIGNED relocation at all. // UNSIGNED relocation at all.
if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_CALLARM64 || r.Type == objabi.R_ADDRARM64 || r.Type == objabi.R_ADDR { if rs.Type == ld.SHOSTOBJ || r.Type == objabi.R_CALLARM64 || r.Type == objabi.R_ADDRARM64 || r.Type == objabi.R_ADDR {
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
...@@ -161,7 +162,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -161,7 +162,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
} else { } else {
v = uint32(rs.Sect.Extnum) v = uint32(rs.Sect.Extnum)
if v == 0 { if v == 0 {
ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type)
return false return false
} }
} }
...@@ -348,7 +349,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -348,7 +349,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
} }
// The TCB is two pointers. This is not documented anywhere, but is // The TCB is two pointers. This is not documented anywhere, but is
// de facto part of the ABI. // de facto part of the ABI.
v := r.Sym.Value + int64(2*ld.SysArch.PtrSize) v := r.Sym.Value + int64(2*ctxt.Arch.PtrSize)
if v < 0 || v >= 32678 { if v < 0 || v >= 32678 {
ld.Errorf(s, "TLS offset out of range %d", v) ld.Errorf(s, "TLS offset out of range %d", v)
} }
......
src/cmd/link/internal/arm64/obj.go
View file @ 5d95de20
...@@ -37,38 +37,42 @@ import ( ...@@ -37,38 +37,42 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
ld.SysArch = sys.ArchARM64 arch := sys.ArchARM64
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel Adddynrel: adddynrel,
ld.Thearch.Archinit = archinit Archinit: archinit,
ld.Thearch.Archreloc = archreloc Archreloc: archreloc,
ld.Thearch.Archrelocvariant = archrelocvariant Archrelocvariant: archrelocvariant,
ld.Thearch.Asmb = asmb Asmb: asmb,
ld.Thearch.Elfreloc1 = elfreloc1 Elfreloc1: elfreloc1,
ld.Thearch.Elfsetupplt = elfsetupplt Elfsetupplt: elfsetupplt,
ld.Thearch.Gentext = gentext Gentext: gentext,
ld.Thearch.Machoreloc1 = machoreloc1 Machoreloc1: machoreloc1,
ld.Thearch.Lput = ld.Lputl Lput: ld.Lputl,
ld.Thearch.Wput = ld.Wputl Wput: ld.Wputl,
ld.Thearch.Vput = ld.Vputl Vput: ld.Vputl,
ld.Thearch.Append16 = ld.Append16l Append16: ld.Append16l,
ld.Thearch.Append32 = ld.Append32l Append32: ld.Append32l,
ld.Thearch.Append64 = ld.Append64l Append64: ld.Append64l,
ld.Thearch.Linuxdynld = "/lib/ld-linux-aarch64.so.1" Linuxdynld: "/lib/ld-linux-aarch64.so.1",
ld.Thearch.Freebsddynld = "XXX" Freebsddynld: "XXX",
ld.Thearch.Openbsddynld = "XXX" Openbsddynld: "XXX",
ld.Thearch.Netbsddynld = "XXX" Netbsddynld: "XXX",
ld.Thearch.Dragonflydynld = "XXX" Dragonflydynld: "XXX",
ld.Thearch.Solarisdynld = "XXX" Solarisdynld: "XXX",
}
return arch, theArch
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
...@@ -104,7 +108,6 @@ func archinit(ctxt *ld.Link) { ...@@ -104,7 +108,6 @@ func archinit(ctxt *ld.Link) {
case objabi.Hdarwin: /* apple MACH */ case objabi.Hdarwin: /* apple MACH */
*ld.FlagW = true // disable DWARF generation *ld.FlagW = true // disable DWARF generation
ld.Machoinit()
ld.HEADR = ld.INITIAL_MACHO_HEADR ld.HEADR = ld.INITIAL_MACHO_HEADR
if *ld.FlagTextAddr == -1 { if *ld.FlagTextAddr == -1 {
*ld.FlagTextAddr = 4096 + int64(ld.HEADR) *ld.FlagTextAddr = 4096 + int64(ld.HEADR)
......
src/cmd/link/internal/ld/config.go
View file @ 5d95de20
...@@ -178,7 +178,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) { ...@@ -178,7 +178,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) {
case "android": case "android":
return true, "android" return true, "android"
case "darwin": case "darwin":
if SysArch.InFamily(sys.ARM, sys.ARM64) { if ctxt.Arch.InFamily(sys.ARM, sys.ARM64) {
return true, "iOS" return true, "iOS"
} }
} }
...@@ -191,7 +191,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) { ...@@ -191,7 +191,7 @@ func mustLinkExternal(ctxt *Link) (res bool, reason string) {
// https://golang.org/issue/10373 // https://golang.org/issue/10373
// https://golang.org/issue/14449 // https://golang.org/issue/14449
// https://golang.org/issue/21961 // https://golang.org/issue/21961
if iscgo && SysArch.InFamily(sys.ARM64, sys.MIPS64, sys.MIPS, sys.PPC64) { if iscgo && ctxt.Arch.InFamily(sys.ARM64, sys.MIPS64, sys.MIPS, sys.PPC64) {
return true, objabi.GOARCH + " does not support internal cgo" return true, objabi.GOARCH + " does not support internal cgo"
} }
......
src/cmd/link/internal/ld/data.go
View file @ 5d95de20
...@@ -129,7 +129,7 @@ func Adduint64(ctxt *Link, s *Symbol, v uint64) int64 { ...@@ -129,7 +129,7 @@ func Adduint64(ctxt *Link, s *Symbol, v uint64) int64 {
} }
func adduint(ctxt *Link, s *Symbol, v uint64) int64 { func adduint(ctxt *Link, s *Symbol, v uint64) int64 {
return adduintxx(ctxt, s, v, SysArch.PtrSize) return adduintxx(ctxt, s, v, ctxt.Arch.PtrSize)
} }
func setuint8(ctxt *Link, s *Symbol, r int64, v uint8) int64 { func setuint8(ctxt *Link, s *Symbol, r int64, v uint8) int64 {
...@@ -141,7 +141,7 @@ func setuint32(ctxt *Link, s *Symbol, r int64, v uint32) int64 { ...@@ -141,7 +141,7 @@ func setuint32(ctxt *Link, s *Symbol, r int64, v uint32) int64 {
} }
func setuint(ctxt *Link, s *Symbol, r int64, v uint64) int64 { func setuint(ctxt *Link, s *Symbol, r int64, v uint64) int64 {
return setuintxx(ctxt, s, r, v, int64(SysArch.PtrSize)) return setuintxx(ctxt, s, r, v, int64(ctxt.Arch.PtrSize))
} }
func Addaddrplus(ctxt *Link, s *Symbol, t *Symbol, add int64) int64 { func Addaddrplus(ctxt *Link, s *Symbol, t *Symbol, add int64) int64 {
...@@ -175,7 +175,7 @@ func Addpcrelplus(ctxt *Link, s *Symbol, t *Symbol, add int64) int64 { ...@@ -175,7 +175,7 @@ func Addpcrelplus(ctxt *Link, s *Symbol, t *Symbol, add int64) int64 {
r.Add = add r.Add = add
r.Type = objabi.R_PCREL r.Type = objabi.R_PCREL
r.Siz = 4 r.Siz = 4
if SysArch.Family == sys.S390X { if ctxt.Arch.Family == sys.S390X {
r.Variant = RV_390_DBL r.Variant = RV_390_DBL
} }
return i + int64(r.Siz) return i + int64(r.Siz)
...@@ -422,8 +422,8 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -422,8 +422,8 @@ func relocsym(ctxt *Link, s *Symbol) {
// We need to be able to reference dynimport symbols when linking against // We need to be able to reference dynimport symbols when linking against
// shared libraries, and Solaris needs it always // shared libraries, and Solaris needs it always
if Headtype != objabi.Hsolaris && r.Sym != nil && r.Sym.Type == SDYNIMPORT && !ctxt.DynlinkingGo() { if Headtype != objabi.Hsolaris && r.Sym != nil && r.Sym.Type == SDYNIMPORT && !ctxt.DynlinkingGo() {
if !(SysArch.Family == sys.PPC64 && Linkmode == LinkExternal && r.Sym.Name == ".TOC.") { if !(ctxt.Arch.Family == sys.PPC64 && Linkmode == LinkExternal && r.Sym.Name == ".TOC.") {
Errorf(s, "unhandled relocation for %s (type %d (%s) rtype %d (%s))", r.Sym.Name, r.Sym.Type, r.Sym.Type, r.Type, RelocName(r.Type)) Errorf(s, "unhandled relocation for %s (type %d (%s) rtype %d (%s))", r.Sym.Name, r.Sym.Type, r.Sym.Type, r.Type, RelocName(ctxt.Arch, r.Type))
} }
} }
if r.Sym != nil && r.Sym.Type != STLSBSS && r.Type != objabi.R_WEAKADDROFF && !r.Sym.Attr.Reachable() { if r.Sym != nil && r.Sym.Type != STLSBSS && r.Type != objabi.R_WEAKADDROFF && !r.Sym.Attr.Reachable() {
...@@ -431,7 +431,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -431,7 +431,7 @@ func relocsym(ctxt *Link, s *Symbol) {
} }
// TODO(mundaym): remove this special case - see issue 14218. // TODO(mundaym): remove this special case - see issue 14218.
if SysArch.Family == sys.S390X { if ctxt.Arch.Family == sys.S390X {
switch r.Type { switch r.Type {
case objabi.R_PCRELDBL: case objabi.R_PCRELDBL:
r.Type = objabi.R_PCREL r.Type = objabi.R_PCREL
...@@ -457,10 +457,10 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -457,10 +457,10 @@ func relocsym(ctxt *Link, s *Symbol) {
o = int64(ctxt.Arch.ByteOrder.Uint64(s.P[off:])) o = int64(ctxt.Arch.ByteOrder.Uint64(s.P[off:]))
} }
if !Thearch.Archreloc(ctxt, r, s, &o) { if !Thearch.Archreloc(ctxt, r, s, &o) {
Errorf(s, "unknown reloc to %v: %d (%s)", r.Sym.Name, r.Type, RelocName(r.Type)) Errorf(s, "unknown reloc to %v: %d (%s)", r.Sym.Name, r.Type, RelocName(ctxt.Arch, r.Type))
} }
case objabi.R_TLS_LE: case objabi.R_TLS_LE:
isAndroidX86 := objabi.GOOS == "android" && (SysArch.InFamily(sys.AMD64, sys.I386)) isAndroidX86 := objabi.GOOS == "android" && (ctxt.Arch.InFamily(sys.AMD64, sys.I386))
if Linkmode == LinkExternal && Iself && !isAndroidX86 { if Linkmode == LinkExternal && Iself && !isAndroidX86 {
r.Done = false r.Done = false
...@@ -470,13 +470,13 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -470,13 +470,13 @@ func relocsym(ctxt *Link, s *Symbol) {
r.Xsym = r.Sym r.Xsym = r.Sym
r.Xadd = r.Add r.Xadd = r.Add
o = 0 o = 0
if SysArch.Family != sys.AMD64 { if ctxt.Arch.Family != sys.AMD64 {
o = r.Add o = r.Add
} }
break break
} }
if Iself && SysArch.Family == sys.ARM { if Iself && ctxt.Arch.Family == sys.ARM {
// On ELF ARM, the thread pointer is 8 bytes before // On ELF ARM, the thread pointer is 8 bytes before
// the start of the thread-local data block, so add 8 // the start of the thread-local data block, so add 8
// to the actual TLS offset (r->sym->value). // to the actual TLS offset (r->sym->value).
...@@ -493,7 +493,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -493,7 +493,7 @@ func relocsym(ctxt *Link, s *Symbol) {
log.Fatalf("unexpected R_TLS_LE relocation for %v", Headtype) log.Fatalf("unexpected R_TLS_LE relocation for %v", Headtype)
} }
case objabi.R_TLS_IE: case objabi.R_TLS_IE:
isAndroidX86 := objabi.GOOS == "android" && (SysArch.InFamily(sys.AMD64, sys.I386)) isAndroidX86 := objabi.GOOS == "android" && (ctxt.Arch.InFamily(sys.AMD64, sys.I386))
if Linkmode == LinkExternal && Iself && !isAndroidX86 { if Linkmode == LinkExternal && Iself && !isAndroidX86 {
r.Done = false r.Done = false
...@@ -503,7 +503,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -503,7 +503,7 @@ func relocsym(ctxt *Link, s *Symbol) {
r.Xsym = r.Sym r.Xsym = r.Sym
r.Xadd = r.Add r.Xadd = r.Add
o = 0 o = 0
if SysArch.Family != sys.AMD64 { if ctxt.Arch.Family != sys.AMD64 {
o = r.Add o = r.Add
} }
break break
...@@ -512,11 +512,11 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -512,11 +512,11 @@ func relocsym(ctxt *Link, s *Symbol) {
// We are linking the final executable, so we // We are linking the final executable, so we
// can optimize any TLS IE relocation to LE. // can optimize any TLS IE relocation to LE.
if Thearch.TLSIEtoLE == nil { if Thearch.TLSIEtoLE == nil {
log.Fatalf("internal linking of TLS IE not supported on %v", SysArch.Family) log.Fatalf("internal linking of TLS IE not supported on %v", ctxt.Arch.Family)
} }
Thearch.TLSIEtoLE(s, int(off), int(r.Siz)) Thearch.TLSIEtoLE(s, int(off), int(r.Siz))
o = int64(ctxt.Tlsoffset) o = int64(ctxt.Tlsoffset)
// TODO: o += r.Add when SysArch.Family != sys.AMD64? // TODO: o += r.Add when ctxt.Arch.Family != sys.AMD64?
// Why do we treat r.Add differently on AMD64? // Why do we treat r.Add differently on AMD64?
// Is the external linker using Xadd at all? // Is the external linker using Xadd at all?
} else { } else {
...@@ -542,7 +542,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -542,7 +542,7 @@ func relocsym(ctxt *Link, s *Symbol) {
o = r.Xadd o = r.Xadd
if Iself { if Iself {
if SysArch.Family == sys.AMD64 { if ctxt.Arch.Family == sys.AMD64 {
o = 0 o = 0
} }
} else if Headtype == objabi.Hdarwin { } else if Headtype == objabi.Hdarwin {
...@@ -552,10 +552,10 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -552,10 +552,10 @@ func relocsym(ctxt *Link, s *Symbol) {
// The workaround is that on arm64 don't ever add symaddr to o and always use // The workaround is that on arm64 don't ever add symaddr to o and always use
// extern relocation by requiring rs->dynid >= 0. // extern relocation by requiring rs->dynid >= 0.
if rs.Type != SHOSTOBJ { if rs.Type != SHOSTOBJ {
if SysArch.Family == sys.ARM64 && rs.Dynid < 0 { if ctxt.Arch.Family == sys.ARM64 && rs.Dynid < 0 {
Errorf(s, "R_ADDR reloc to %s+%d is not supported on darwin/arm64", rs.Name, o) Errorf(s, "R_ADDR reloc to %s+%d is not supported on darwin/arm64", rs.Name, o)
} }
if SysArch.Family != sys.ARM64 { if ctxt.Arch.Family != sys.ARM64 {
o += Symaddr(rs) o += Symaddr(rs)
} }
} }
...@@ -575,7 +575,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -575,7 +575,7 @@ func relocsym(ctxt *Link, s *Symbol) {
// fail at runtime. See https://golang.org/issue/7980. // fail at runtime. See https://golang.org/issue/7980.
// Instead of special casing only amd64, we treat this as an error on all // Instead of special casing only amd64, we treat this as an error on all
// 64-bit architectures so as to be future-proof. // 64-bit architectures so as to be future-proof.
if int32(o) < 0 && SysArch.PtrSize > 4 && siz == 4 { if int32(o) < 0 && ctxt.Arch.PtrSize > 4 && siz == 4 {
Errorf(s, "non-pc-relative relocation address for %s is too big: %#x (%#x + %#x)", r.Sym.Name, uint64(o), Symaddr(r.Sym), r.Add) Errorf(s, "non-pc-relative relocation address for %s is too big: %#x (%#x + %#x)", r.Sym.Name, uint64(o), Symaddr(r.Sym), r.Add)
errorexit() errorexit()
} }
...@@ -599,7 +599,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -599,7 +599,7 @@ func relocsym(ctxt *Link, s *Symbol) {
r.Xadd = r.Add + Symaddr(r.Sym) - int64(r.Sym.Sect.Vaddr) r.Xadd = r.Add + Symaddr(r.Sym) - int64(r.Sym.Sect.Vaddr)
o = r.Xadd o = r.Xadd
if Iself && SysArch.Family == sys.AMD64 { if Iself && ctxt.Arch.Family == sys.AMD64 {
o = 0 o = 0
} }
break break
...@@ -654,7 +654,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -654,7 +654,7 @@ func relocsym(ctxt *Link, s *Symbol) {
o = r.Xadd o = r.Xadd
if Iself { if Iself {
if SysArch.Family == sys.AMD64 { if ctxt.Arch.Family == sys.AMD64 {
o = 0 o = 0
} }
} else if Headtype == objabi.Hdarwin { } else if Headtype == objabi.Hdarwin {
...@@ -663,13 +663,13 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -663,13 +663,13 @@ func relocsym(ctxt *Link, s *Symbol) {
o += int64(uint64(Symaddr(rs)) - rs.Sect.Vaddr) o += int64(uint64(Symaddr(rs)) - rs.Sect.Vaddr)
} }
o -= int64(r.Off) // relative to section offset, not symbol o -= int64(r.Off) // relative to section offset, not symbol
} else if SysArch.Family == sys.ARM { } else if ctxt.Arch.Family == sys.ARM {
// see ../arm/asm.go:/machoreloc1 // see ../arm/asm.go:/machoreloc1
o += Symaddr(rs) - int64(s.Value) - int64(r.Off) o += Symaddr(rs) - int64(s.Value) - int64(r.Off)
} else { } else {
o += int64(r.Siz) o += int64(r.Siz)
} }
} else if Headtype == objabi.Hwindows && SysArch.Family == sys.AMD64 { // only amd64 needs PCREL } else if Headtype == objabi.Hwindows && ctxt.Arch.Family == sys.AMD64 { // only amd64 needs PCREL
// PE/COFF's PC32 relocation uses the address after the relocated // PE/COFF's PC32 relocation uses the address after the relocated
// bytes as the base. Compensate by skewing the addend. // bytes as the base. Compensate by skewing the addend.
o += int64(r.Siz) o += int64(r.Siz)
...@@ -699,7 +699,7 @@ func relocsym(ctxt *Link, s *Symbol) { ...@@ -699,7 +699,7 @@ func relocsym(ctxt *Link, s *Symbol) {
if r.Sym != nil { if r.Sym != nil {
nam = r.Sym.Name nam = r.Sym.Name
} }
fmt.Printf("relocate %s %#x (%#x+%#x, size %d) => %s %#x +%#x [type %d (%s)/%d, %x]\n", s.Name, s.Value+int64(off), s.Value, r.Off, r.Siz, nam, Symaddr(r.Sym), r.Add, r.Type, RelocName(r.Type), r.Variant, o) fmt.Printf("relocate %s %#x (%#x+%#x, size %d) => %s %#x +%#x [type %d (%s)/%d, %x]\n", s.Name, s.Value+int64(off), s.Value, r.Off, r.Siz, nam, Symaddr(r.Sym), r.Add, r.Type, RelocName(ctxt.Arch, r.Type), r.Variant, o)
} }
switch siz { switch siz {
default: default:
...@@ -773,7 +773,7 @@ func windynrelocsym(ctxt *Link, s *Symbol) { ...@@ -773,7 +773,7 @@ func windynrelocsym(ctxt *Link, s *Symbol) {
r.Add = int64(targ.Plt) r.Add = int64(targ.Plt)
// jmp *addr // jmp *addr
if SysArch.Family == sys.I386 { if ctxt.Arch.Family == sys.I386 {
Adduint8(ctxt, rel, 0xff) Adduint8(ctxt, rel, 0xff)
Adduint8(ctxt, rel, 0x25) Adduint8(ctxt, rel, 0x25)
Addaddr(ctxt, rel, targ) Addaddr(ctxt, rel, targ)
...@@ -815,7 +815,7 @@ func dynrelocsym(ctxt *Link, s *Symbol) { ...@@ -815,7 +815,7 @@ func dynrelocsym(ctxt *Link, s *Symbol) {
Errorf(s, "dynamic relocation to unreachable symbol %s", r.Sym.Name) Errorf(s, "dynamic relocation to unreachable symbol %s", r.Sym.Name)
} }
if !Thearch.Adddynrel(ctxt, s, r) { if !Thearch.Adddynrel(ctxt, s, r) {
Errorf(s, "unsupported dynamic relocation for symbol %s (type=%d (%s) stype=%d (%s))", r.Sym.Name, r.Type, RelocName(r.Type), r.Sym.Type, r.Sym.Type) Errorf(s, "unsupported dynamic relocation for symbol %s (type=%d (%s) stype=%d (%s))", r.Sym.Name, r.Type, RelocName(ctxt.Arch, r.Type), r.Sym.Type, r.Sym.Type)
} }
} }
} }
...@@ -1085,7 +1085,7 @@ func addstrdata(ctxt *Link, name string, value string) { ...@@ -1085,7 +1085,7 @@ func addstrdata(ctxt *Link, name string, value string) {
s.Attr |= AttrDuplicateOK s.Attr |= AttrDuplicateOK
reachable := s.Attr.Reachable() reachable := s.Attr.Reachable()
Addaddr(ctxt, s, sp) Addaddr(ctxt, s, sp)
adduintxx(ctxt, s, uint64(len(value)), SysArch.PtrSize) adduintxx(ctxt, s, uint64(len(value)), ctxt.Arch.PtrSize)
// addstring, addaddr, etc., mark the symbols as reachable. // addstring, addaddr, etc., mark the symbols as reachable.
// In this case that is not necessarily true, so stick to what // In this case that is not necessarily true, so stick to what
...@@ -1209,7 +1209,7 @@ func (p *GCProg) writeByte(ctxt *Link) func(x byte) { ...@@ -1209,7 +1209,7 @@ func (p *GCProg) writeByte(ctxt *Link) func(x byte) {
} }
func (p *GCProg) End(size int64) { func (p *GCProg) End(size int64) {
p.w.ZeroUntil(size / int64(SysArch.PtrSize)) p.w.ZeroUntil(size / int64(p.ctxt.Arch.PtrSize))
p.w.End() p.w.End()
if debugGCProg { if debugGCProg {
fmt.Fprintf(os.Stderr, "ld: end GCProg\n") fmt.Fprintf(os.Stderr, "ld: end GCProg\n")
...@@ -1232,14 +1232,14 @@ func (p *GCProg) AddSym(s *Symbol) { ...@@ -1232,14 +1232,14 @@ func (p *GCProg) AddSym(s *Symbol) {
return return
} }
ptrsize := int64(SysArch.PtrSize) ptrsize := int64(p.ctxt.Arch.PtrSize)
nptr := decodetypePtrdata(p.ctxt.Arch, typ) / ptrsize nptr := decodetypePtrdata(p.ctxt.Arch, typ) / ptrsize
if debugGCProg { if debugGCProg {
fmt.Fprintf(os.Stderr, "gcprog sym: %s at %d (ptr=%d+%d)\n", s.Name, s.Value, s.Value/ptrsize, nptr) fmt.Fprintf(os.Stderr, "gcprog sym: %s at %d (ptr=%d+%d)\n", s.Name, s.Value, s.Value/ptrsize, nptr)
} }
if decodetypeUsegcprog(typ) == 0 { if decodetypeUsegcprog(p.ctxt.Arch, typ) == 0 {
// Copy pointers from mask into program. // Copy pointers from mask into program.
mask := decodetypeGcmask(p.ctxt, typ) mask := decodetypeGcmask(p.ctxt, typ)
for i := int64(0); i < nptr; i++ { for i := int64(0); i < nptr; i++ {
...@@ -1430,7 +1430,7 @@ func (ctxt *Link) dodata() { ...@@ -1430,7 +1430,7 @@ func (ctxt *Link) dodata() {
} }
for _, symn := range writable { for _, symn := range writable {
for _, s := range data[symn] { for _, s := range data[symn] {
sect := addsection(&Segdata, s.Name, 06) sect := addsection(ctxt.Arch, &Segdata, s.Name, 06)
sect.Align = symalign(s) sect.Align = symalign(s)
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1445,7 +1445,7 @@ func (ctxt *Link) dodata() { ...@@ -1445,7 +1445,7 @@ func (ctxt *Link) dodata() {
// .got (and .toc on ppc64) // .got (and .toc on ppc64)
if len(data[SELFGOT]) > 0 { if len(data[SELFGOT]) > 0 {
sect := addsection(&Segdata, ".got", 06) sect := addsection(ctxt.Arch, &Segdata, ".got", 06)
sect.Align = dataMaxAlign[SELFGOT] sect.Align = dataMaxAlign[SELFGOT]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1474,7 +1474,7 @@ func (ctxt *Link) dodata() { ...@@ -1474,7 +1474,7 @@ func (ctxt *Link) dodata() {
} }
/* pointer-free data */ /* pointer-free data */
sect := addsection(&Segdata, ".noptrdata", 06) sect := addsection(ctxt.Arch, &Segdata, ".noptrdata", 06)
sect.Align = dataMaxAlign[SNOPTRDATA] sect.Align = dataMaxAlign[SNOPTRDATA]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1498,7 +1498,7 @@ func (ctxt *Link) dodata() { ...@@ -1498,7 +1498,7 @@ func (ctxt *Link) dodata() {
hasinitarr = true hasinitarr = true
} }
if hasinitarr { if hasinitarr {
sect := addsection(&Segdata, ".init_array", 06) sect := addsection(ctxt.Arch, &Segdata, ".init_array", 06)
sect.Align = dataMaxAlign[SINITARR] sect.Align = dataMaxAlign[SINITARR]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1513,7 +1513,7 @@ func (ctxt *Link) dodata() { ...@@ -1513,7 +1513,7 @@ func (ctxt *Link) dodata() {
} }
/* data */ /* data */
sect = addsection(&Segdata, ".data", 06) sect = addsection(ctxt.Arch, &Segdata, ".data", 06)
sect.Align = dataMaxAlign[SDATA] sect.Align = dataMaxAlign[SDATA]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1534,7 +1534,7 @@ func (ctxt *Link) dodata() { ...@@ -1534,7 +1534,7 @@ func (ctxt *Link) dodata() {
gc.End(int64(sect.Length)) gc.End(int64(sect.Length))
/* bss */ /* bss */
sect = addsection(&Segdata, ".bss", 06) sect = addsection(ctxt.Arch, &Segdata, ".bss", 06)
sect.Align = dataMaxAlign[SBSS] sect.Align = dataMaxAlign[SBSS]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1554,7 +1554,7 @@ func (ctxt *Link) dodata() { ...@@ -1554,7 +1554,7 @@ func (ctxt *Link) dodata() {
gc.End(int64(sect.Length)) gc.End(int64(sect.Length))
/* pointer-free bss */ /* pointer-free bss */
sect = addsection(&Segdata, ".noptrbss", 06) sect = addsection(ctxt.Arch, &Segdata, ".noptrbss", 06)
sect.Align = dataMaxAlign[SNOPTRBSS] sect.Align = dataMaxAlign[SNOPTRBSS]
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1574,8 +1574,8 @@ func (ctxt *Link) dodata() { ...@@ -1574,8 +1574,8 @@ func (ctxt *Link) dodata() {
if len(data[STLSBSS]) > 0 { if len(data[STLSBSS]) > 0 {
var sect *Section var sect *Section
if Iself && (Linkmode == LinkExternal || !*FlagD) { if Iself && (Linkmode == LinkExternal || !*FlagD) {
sect = addsection(&Segdata, ".tbss", 06) sect = addsection(ctxt.Arch, &Segdata, ".tbss", 06)
sect.Align = int32(SysArch.PtrSize) sect.Align = int32(ctxt.Arch.PtrSize)
sect.Vaddr = 0 sect.Vaddr = 0
} }
datsize = 0 datsize = 0
...@@ -1617,7 +1617,7 @@ func (ctxt *Link) dodata() { ...@@ -1617,7 +1617,7 @@ func (ctxt *Link) dodata() {
Errorf(nil, "dodata found an STEXT symbol: %s", data[STEXT][0].Name) Errorf(nil, "dodata found an STEXT symbol: %s", data[STEXT][0].Name)
} }
for _, s := range data[SELFRXSECT] { for _, s := range data[SELFRXSECT] {
sect := addsection(&Segtext, s.Name, 04) sect := addsection(ctxt.Arch, &Segtext, s.Name, 04)
sect.Align = symalign(s) sect.Align = symalign(s)
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1630,7 +1630,7 @@ func (ctxt *Link) dodata() { ...@@ -1630,7 +1630,7 @@ func (ctxt *Link) dodata() {
} }
/* read-only data */ /* read-only data */
sect = addsection(segro, ".rodata", 04) sect = addsection(ctxt.Arch, segro, ".rodata", 04)
sect.Vaddr = 0 sect.Vaddr = 0
ctxt.Syms.Lookup("runtime.rodata", 0).Sect = sect ctxt.Syms.Lookup("runtime.rodata", 0).Sect = sect
...@@ -1660,7 +1660,7 @@ func (ctxt *Link) dodata() { ...@@ -1660,7 +1660,7 @@ func (ctxt *Link) dodata() {
/* read-only ELF, Mach-O sections */ /* read-only ELF, Mach-O sections */
for _, s := range data[SELFROSECT] { for _, s := range data[SELFROSECT] {
sect = addsection(segro, s.Name, 04) sect = addsection(ctxt.Arch, segro, s.Name, 04)
sect.Align = symalign(s) sect.Align = symalign(s)
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1673,7 +1673,7 @@ func (ctxt *Link) dodata() { ...@@ -1673,7 +1673,7 @@ func (ctxt *Link) dodata() {
checkdatsize(ctxt, datsize, SELFROSECT) checkdatsize(ctxt, datsize, SELFROSECT)
for _, s := range data[SMACHOPLT] { for _, s := range data[SMACHOPLT] {
sect = addsection(segro, s.Name, 04) sect = addsection(ctxt.Arch, segro, s.Name, 04)
sect.Align = symalign(s) sect.Align = symalign(s)
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1696,7 +1696,7 @@ func (ctxt *Link) dodata() { ...@@ -1696,7 +1696,7 @@ func (ctxt *Link) dodata() {
// TODO(mwhudson): It would make sense to do this more widely, but it makes // TODO(mwhudson): It would make sense to do this more widely, but it makes
// the system linker segfault on darwin. // the system linker segfault on darwin.
addrelrosection := func(suffix string) *Section { addrelrosection := func(suffix string) *Section {
return addsection(segro, suffix, 04) return addsection(ctxt.Arch, segro, suffix, 04)
} }
if UseRelro() { if UseRelro() {
...@@ -1711,7 +1711,7 @@ func (ctxt *Link) dodata() { ...@@ -1711,7 +1711,7 @@ func (ctxt *Link) dodata() {
// sort out a rel.ro segment. // sort out a rel.ro segment.
seg = &Segrodata seg = &Segrodata
} }
return addsection(seg, ".data.rel.ro"+suffix, 06) return addsection(ctxt.Arch, seg, ".data.rel.ro"+suffix, 06)
} }
/* data only written by relocations */ /* data only written by relocations */
sect = addrelrosection("") sect = addrelrosection("")
...@@ -1826,7 +1826,7 @@ func (ctxt *Link) dodata() { ...@@ -1826,7 +1826,7 @@ func (ctxt *Link) dodata() {
break break
} }
sect = addsection(&Segdwarf, s.Name, 04) sect = addsection(ctxt.Arch, &Segdwarf, s.Name, 04)
sect.Align = 1 sect.Align = 1
datsize = Rnd(datsize, int64(sect.Align)) datsize = Rnd(datsize, int64(sect.Align))
sect.Vaddr = uint64(datsize) sect.Vaddr = uint64(datsize)
...@@ -1843,11 +1843,11 @@ func (ctxt *Link) dodata() { ...@@ -1843,11 +1843,11 @@ func (ctxt *Link) dodata() {
var sect *Section var sect *Section
switch curType { switch curType {
case SDWARFINFO: case SDWARFINFO:
sect = addsection(&Segdwarf, ".debug_info", 04) sect = addsection(ctxt.Arch, &Segdwarf, ".debug_info", 04)
case SDWARFRANGE: case SDWARFRANGE:
sect = addsection(&Segdwarf, ".debug_ranges", 04) sect = addsection(ctxt.Arch, &Segdwarf, ".debug_ranges", 04)
case SDWARFLOC: case SDWARFLOC:
sect = addsection(&Segdwarf, ".debug_loc", 04) sect = addsection(ctxt.Arch, &Segdwarf, ".debug_loc", 04)
default: default:
Errorf(dwarfp[i], "unknown DWARF section %v", curType) Errorf(dwarfp[i], "unknown DWARF section %v", curType)
} }
...@@ -2002,8 +2002,8 @@ func dodataSect(ctxt *Link, symn SymKind, syms []*Symbol) (result []*Symbol, max ...@@ -2002,8 +2002,8 @@ func dodataSect(ctxt *Link, symn SymKind, syms []*Symbol) (result []*Symbol, max
// Setting the alignment explicitly prevents // Setting the alignment explicitly prevents
// symalign from basing it on the size and // symalign from basing it on the size and
// getting it wrong. // getting it wrong.
rel.Align = int32(SysArch.RegSize) rel.Align = int32(ctxt.Arch.RegSize)
plt.Align = int32(SysArch.RegSize) plt.Align = int32(ctxt.Arch.RegSize)
} }
} }
...@@ -2036,7 +2036,7 @@ func (ctxt *Link) textbuildid() { ...@@ -2036,7 +2036,7 @@ func (ctxt *Link) textbuildid() {
// assign addresses to text // assign addresses to text
func (ctxt *Link) textaddress() { func (ctxt *Link) textaddress() {
addsection(&Segtext, ".text", 05) addsection(ctxt.Arch, &Segtext, ".text", 05)
// Assign PCs in text segment. // Assign PCs in text segment.
// Could parallelize, by assigning to text // Could parallelize, by assigning to text
...@@ -2124,13 +2124,13 @@ func assignAddress(ctxt *Link, sect *Section, n int, sym *Symbol, va uint64, isT ...@@ -2124,13 +2124,13 @@ func assignAddress(ctxt *Link, sect *Section, n int, sym *Symbol, va uint64, isT
// Only break at outermost syms. // Only break at outermost syms.
if SysArch.InFamily(sys.PPC64) && sym.Outer == nil && Iself && Linkmode == LinkExternal && va-sect.Vaddr+funcsize+maxSizeTrampolinesPPC64(sym, isTramp) > 0x1c00000 { if ctxt.Arch.InFamily(sys.PPC64) && sym.Outer == nil && Iself && Linkmode == LinkExternal && va-sect.Vaddr+funcsize+maxSizeTrampolinesPPC64(sym, isTramp) > 0x1c00000 {
// Set the length for the previous text section // Set the length for the previous text section
sect.Length = va - sect.Vaddr sect.Length = va - sect.Vaddr
// Create new section, set the starting Vaddr // Create new section, set the starting Vaddr
sect = addsection(&Segtext, ".text", 05) sect = addsection(ctxt.Arch, &Segtext, ".text", 05)
sect.Vaddr = va sect.Vaddr = va
sym.Sect = sect sym.Sect = sect
......
src/cmd/link/internal/ld/deadcode.go
View file @ 5d95de20
...@@ -199,7 +199,7 @@ func (d *deadcodepass) markMethod(m methodref) { ...@@ -199,7 +199,7 @@ func (d *deadcodepass) markMethod(m methodref) {
func (d *deadcodepass) init() { func (d *deadcodepass) init() {
var names []string var names []string
if SysArch.Family == sys.ARM { if d.ctxt.Arch.Family == sys.ARM {
// mark some functions that are only referenced after linker code editing // mark some functions that are only referenced after linker code editing
names = append(names, "runtime.read_tls_fallback") names = append(names, "runtime.read_tls_fallback")
} }
...@@ -221,7 +221,7 @@ func (d *deadcodepass) init() { ...@@ -221,7 +221,7 @@ func (d *deadcodepass) init() {
} else { } else {
// The external linker refers main symbol directly. // The external linker refers main symbol directly.
if Linkmode == LinkExternal && (Buildmode == BuildmodeExe || Buildmode == BuildmodePIE) { if Linkmode == LinkExternal && (Buildmode == BuildmodeExe || Buildmode == BuildmodePIE) {
if Headtype == objabi.Hwindows && SysArch.Family == sys.I386 { if Headtype == objabi.Hwindows && d.ctxt.Arch.Family == sys.I386 {
*flagEntrySymbol = "_main" *flagEntrySymbol = "_main"
} else { } else {
*flagEntrySymbol = "main" *flagEntrySymbol = "main"
...@@ -275,7 +275,7 @@ func (d *deadcodepass) flood() { ...@@ -275,7 +275,7 @@ func (d *deadcodepass) flood() {
// later will give a better error than deadcode. // later will give a better error than deadcode.
continue continue
} }
if decodetypeKind(s)&kindMask == kindInterface { if decodetypeKind(d.ctxt.Arch, s)&kindMask == kindInterface {
for _, sig := range decodeIfaceMethods(d.ctxt.Arch, s) { for _, sig := range decodeIfaceMethods(d.ctxt.Arch, s) {
if d.ctxt.Debugvlog > 1 { if d.ctxt.Debugvlog > 1 {
d.ctxt.Logf("reached iface method: %s\n", sig) d.ctxt.Logf("reached iface method: %s\n", sig)
......
src/cmd/link/internal/ld/decodesym.go
View file @ 5d95de20
...@@ -59,33 +59,33 @@ func decodeInuxi(arch *sys.Arch, p []byte, sz int) uint64 { ...@@ -59,33 +59,33 @@ func decodeInuxi(arch *sys.Arch, p []byte, sz int) uint64 {
} }
} }
func commonsize() int { return 4*SysArch.PtrSize + 8 + 8 } // runtime._type func commonsize(arch *sys.Arch) int { return 4*arch.PtrSize + 8 + 8 } // runtime._type
func structfieldSize() int { return 3 * SysArch.PtrSize } // runtime.structfield func structfieldSize(arch *sys.Arch) int { return 3 * arch.PtrSize } // runtime.structfield
func uncommonSize() int { return 4 + 2 + 2 + 4 + 4 } // runtime.uncommontype func uncommonSize() int { return 4 + 2 + 2 + 4 + 4 } // runtime.uncommontype
// Type.commonType.kind // Type.commonType.kind
func decodetypeKind(s *Symbol) uint8 { func decodetypeKind(arch *sys.Arch, s *Symbol) uint8 {
return s.P[2*SysArch.PtrSize+7] & objabi.KindMask // 0x13 / 0x1f return s.P[2*arch.PtrSize+7] & objabi.KindMask // 0x13 / 0x1f
} }
// Type.commonType.kind // Type.commonType.kind
func decodetypeUsegcprog(s *Symbol) uint8 { func decodetypeUsegcprog(arch *sys.Arch, s *Symbol) uint8 {
return s.P[2*SysArch.PtrSize+7] & objabi.KindGCProg // 0x13 / 0x1f return s.P[2*arch.PtrSize+7] & objabi.KindGCProg // 0x13 / 0x1f
} }
// Type.commonType.size // Type.commonType.size
func decodetypeSize(arch *sys.Arch, s *Symbol) int64 { func decodetypeSize(arch *sys.Arch, s *Symbol) int64 {
return int64(decodeInuxi(arch, s.P, SysArch.PtrSize)) // 0x8 / 0x10 return int64(decodeInuxi(arch, s.P, arch.PtrSize)) // 0x8 / 0x10
} }
// Type.commonType.ptrdata // Type.commonType.ptrdata
func decodetypePtrdata(arch *sys.Arch, s *Symbol) int64 { func decodetypePtrdata(arch *sys.Arch, s *Symbol) int64 {
return int64(decodeInuxi(arch, s.P[SysArch.PtrSize:], SysArch.PtrSize)) // 0x8 / 0x10 return int64(decodeInuxi(arch, s.P[arch.PtrSize:], arch.PtrSize)) // 0x8 / 0x10
} }
// Type.commonType.tflag // Type.commonType.tflag
func decodetypeHasUncommon(s *Symbol) bool { func decodetypeHasUncommon(arch *sys.Arch, s *Symbol) bool {
return s.P[2*SysArch.PtrSize+4]&tflagUncommon != 0 return s.P[2*arch.PtrSize+4]&tflagUncommon != 0
} }
// Find the elf.Section of a given shared library that contains a given address. // Find the elf.Section of a given shared library that contains a given address.
...@@ -119,11 +119,11 @@ func decodetypeGcprog(ctxt *Link, s *Symbol) []byte { ...@@ -119,11 +119,11 @@ func decodetypeGcprog(ctxt *Link, s *Symbol) []byte {
Exitf("cannot find gcprog for %s", s.Name) Exitf("cannot find gcprog for %s", s.Name)
return nil return nil
} }
return decodeRelocSym(s, 2*int32(SysArch.PtrSize)+8+1*int32(SysArch.PtrSize)).P return decodeRelocSym(s, 2*int32(ctxt.Arch.PtrSize)+8+1*int32(ctxt.Arch.PtrSize)).P
} }
func decodetypeGcprogShlib(ctxt *Link, s *Symbol) uint64 { func decodetypeGcprogShlib(ctxt *Link, s *Symbol) uint64 {
if SysArch.Family == sys.ARM64 { if ctxt.Arch.Family == sys.ARM64 {
for _, shlib := range ctxt.Shlibs { for _, shlib := range ctxt.Shlibs {
if shlib.Path == s.File { if shlib.Path == s.File {
return shlib.gcdataAddresses[s] return shlib.gcdataAddresses[s]
...@@ -131,7 +131,7 @@ func decodetypeGcprogShlib(ctxt *Link, s *Symbol) uint64 { ...@@ -131,7 +131,7 @@ func decodetypeGcprogShlib(ctxt *Link, s *Symbol) uint64 {
} }
return 0 return 0
} }
return decodeInuxi(ctxt.Arch, s.P[2*int32(SysArch.PtrSize)+8+1*int32(SysArch.PtrSize):], SysArch.PtrSize) return decodeInuxi(ctxt.Arch, s.P[2*int32(ctxt.Arch.PtrSize)+8+1*int32(ctxt.Arch.PtrSize):], ctxt.Arch.PtrSize)
} }
func decodetypeGcmask(ctxt *Link, s *Symbol) []byte { func decodetypeGcmask(ctxt *Link, s *Symbol) []byte {
...@@ -140,92 +140,92 @@ func decodetypeGcmask(ctxt *Link, s *Symbol) []byte { ...@@ -140,92 +140,92 @@ func decodetypeGcmask(ctxt *Link, s *Symbol) []byte {
ptrdata := decodetypePtrdata(ctxt.Arch, s) ptrdata := decodetypePtrdata(ctxt.Arch, s)
sect := findShlibSection(ctxt, s.File, addr) sect := findShlibSection(ctxt, s.File, addr)
if sect != nil { if sect != nil {
r := make([]byte, ptrdata/int64(SysArch.PtrSize)) r := make([]byte, ptrdata/int64(ctxt.Arch.PtrSize))
sect.ReadAt(r, int64(addr-sect.Addr)) sect.ReadAt(r, int64(addr-sect.Addr))
return r return r
} }
Exitf("cannot find gcmask for %s", s.Name) Exitf("cannot find gcmask for %s", s.Name)
return nil return nil
} }
mask := decodeRelocSym(s, 2*int32(SysArch.PtrSize)+8+1*int32(SysArch.PtrSize)) mask := decodeRelocSym(s, 2*int32(ctxt.Arch.PtrSize)+8+1*int32(ctxt.Arch.PtrSize))
return mask.P return mask.P
} }
// Type.ArrayType.elem and Type.SliceType.Elem // Type.ArrayType.elem and Type.SliceType.Elem
func decodetypeArrayElem(s *Symbol) *Symbol { func decodetypeArrayElem(arch *sys.Arch, s *Symbol) *Symbol {
return decodeRelocSym(s, int32(commonsize())) // 0x1c / 0x30 return decodeRelocSym(s, int32(commonsize(arch))) // 0x1c / 0x30
} }
func decodetypeArrayLen(arch *sys.Arch, s *Symbol) int64 { func decodetypeArrayLen(arch *sys.Arch, s *Symbol) int64 {
return int64(decodeInuxi(arch, s.P[commonsize()+2*SysArch.PtrSize:], SysArch.PtrSize)) return int64(decodeInuxi(arch, s.P[commonsize(arch)+2*arch.PtrSize:], arch.PtrSize))
} }
// Type.PtrType.elem // Type.PtrType.elem
func decodetypePtrElem(s *Symbol) *Symbol { func decodetypePtrElem(arch *sys.Arch, s *Symbol) *Symbol {
return decodeRelocSym(s, int32(commonsize())) // 0x1c / 0x30 return decodeRelocSym(s, int32(commonsize(arch))) // 0x1c / 0x30
} }
// Type.MapType.key, elem // Type.MapType.key, elem
func decodetypeMapKey(s *Symbol) *Symbol { func decodetypeMapKey(arch *sys.Arch, s *Symbol) *Symbol {
return decodeRelocSym(s, int32(commonsize())) // 0x1c / 0x30 return decodeRelocSym(s, int32(commonsize(arch))) // 0x1c / 0x30
} }
func decodetypeMapValue(s *Symbol) *Symbol { func decodetypeMapValue(arch *sys.Arch, s *Symbol) *Symbol {
return decodeRelocSym(s, int32(commonsize())+int32(SysArch.PtrSize)) // 0x20 / 0x38 return decodeRelocSym(s, int32(commonsize(arch))+int32(arch.PtrSize)) // 0x20 / 0x38
} }
// Type.ChanType.elem // Type.ChanType.elem
func decodetypeChanElem(s *Symbol) *Symbol { func decodetypeChanElem(arch *sys.Arch, s *Symbol) *Symbol {
return decodeRelocSym(s, int32(commonsize())) // 0x1c / 0x30 return decodeRelocSym(s, int32(commonsize(arch))) // 0x1c / 0x30
} }
// Type.FuncType.dotdotdot // Type.FuncType.dotdotdot
func decodetypeFuncDotdotdot(arch *sys.Arch, s *Symbol) bool { func decodetypeFuncDotdotdot(arch *sys.Arch, s *Symbol) bool {
return uint16(decodeInuxi(arch, s.P[commonsize()+2:], 2))&(1<<15) != 0 return uint16(decodeInuxi(arch, s.P[commonsize(arch)+2:], 2))&(1<<15) != 0
} }
// Type.FuncType.inCount // Type.FuncType.inCount
func decodetypeFuncInCount(arch *sys.Arch, s *Symbol) int { func decodetypeFuncInCount(arch *sys.Arch, s *Symbol) int {
return int(decodeInuxi(arch, s.P[commonsize():], 2)) return int(decodeInuxi(arch, s.P[commonsize(arch):], 2))
} }
func decodetypeFuncOutCount(arch *sys.Arch, s *Symbol) int { func decodetypeFuncOutCount(arch *sys.Arch, s *Symbol) int {
return int(uint16(decodeInuxi(arch, s.P[commonsize()+2:], 2)) & (1<<15 - 1)) return int(uint16(decodeInuxi(arch, s.P[commonsize(arch)+2:], 2)) & (1<<15 - 1))
} }
func decodetypeFuncInType(s *Symbol, i int) *Symbol { func decodetypeFuncInType(arch *sys.Arch, s *Symbol, i int) *Symbol {
uadd := commonsize() + 4 uadd := commonsize(arch) + 4
if SysArch.PtrSize == 8 { if arch.PtrSize == 8 {
uadd += 4 uadd += 4
} }
if decodetypeHasUncommon(s) { if decodetypeHasUncommon(arch, s) {
uadd += uncommonSize() uadd += uncommonSize()
} }
return decodeRelocSym(s, int32(uadd+i*SysArch.PtrSize)) return decodeRelocSym(s, int32(uadd+i*arch.PtrSize))
} }
func decodetypeFuncOutType(arch *sys.Arch, s *Symbol, i int) *Symbol { func decodetypeFuncOutType(arch *sys.Arch, s *Symbol, i int) *Symbol {
return decodetypeFuncInType(s, i+decodetypeFuncInCount(arch, s)) return decodetypeFuncInType(arch, s, i+decodetypeFuncInCount(arch, s))
} }
// Type.StructType.fields.Slice::length // Type.StructType.fields.Slice::length
func decodetypeStructFieldCount(arch *sys.Arch, s *Symbol) int { func decodetypeStructFieldCount(arch *sys.Arch, s *Symbol) int {
return int(decodeInuxi(arch, s.P[commonsize()+2*SysArch.PtrSize:], SysArch.PtrSize)) return int(decodeInuxi(arch, s.P[commonsize(arch)+2*arch.PtrSize:], arch.PtrSize))
} }
func decodetypeStructFieldArrayOff(s *Symbol, i int) int { func decodetypeStructFieldArrayOff(arch *sys.Arch, s *Symbol, i int) int {
off := commonsize() + 4*SysArch.PtrSize off := commonsize(arch) + 4*arch.PtrSize
if decodetypeHasUncommon(s) { if decodetypeHasUncommon(arch, s) {
off += uncommonSize() off += uncommonSize()
} }
off += i * structfieldSize() off += i * structfieldSize(arch)
return off return off
} }
// decodetypeStr returns the contents of an rtype's str field (a nameOff). // decodetypeStr returns the contents of an rtype's str field (a nameOff).
func decodetypeStr(s *Symbol) string { func decodetypeStr(arch *sys.Arch, s *Symbol) string {
str := decodetypeName(s, 4*SysArch.PtrSize+8) str := decodetypeName(s, 4*arch.PtrSize+8)
if s.P[2*SysArch.PtrSize+4]&tflagExtraStar != 0 { if s.P[2*arch.PtrSize+4]&tflagExtraStar != 0 {
return str[1:] return str[1:]
} }
return str return str
...@@ -243,14 +243,14 @@ func decodetypeName(s *Symbol, off int) string { ...@@ -243,14 +243,14 @@ func decodetypeName(s *Symbol, off int) string {
return string(data[3 : 3+namelen]) return string(data[3 : 3+namelen])
} }
func decodetypeStructFieldName(s *Symbol, i int) string { func decodetypeStructFieldName(arch *sys.Arch, s *Symbol, i int) string {
off := decodetypeStructFieldArrayOff(s, i) off := decodetypeStructFieldArrayOff(arch, s, i)
return decodetypeName(s, off) return decodetypeName(s, off)
} }
func decodetypeStructFieldType(s *Symbol, i int) *Symbol { func decodetypeStructFieldType(arch *sys.Arch, s *Symbol, i int) *Symbol {
off := decodetypeStructFieldArrayOff(s, i) off := decodetypeStructFieldArrayOff(arch, s, i)
return decodeRelocSym(s, int32(off+SysArch.PtrSize)) return decodeRelocSym(s, int32(off+arch.PtrSize))
} }
func decodetypeStructFieldOffs(arch *sys.Arch, s *Symbol, i int) int64 { func decodetypeStructFieldOffs(arch *sys.Arch, s *Symbol, i int) int64 {
...@@ -258,13 +258,13 @@ func decodetypeStructFieldOffs(arch *sys.Arch, s *Symbol, i int) int64 { ...@@ -258,13 +258,13 @@ func decodetypeStructFieldOffs(arch *sys.Arch, s *Symbol, i int) int64 {
} }
func decodetypeStructFieldOffsAnon(arch *sys.Arch, s *Symbol, i int) int64 { func decodetypeStructFieldOffsAnon(arch *sys.Arch, s *Symbol, i int) int64 {
off := decodetypeStructFieldArrayOff(s, i) off := decodetypeStructFieldArrayOff(arch, s, i)
return int64(decodeInuxi(arch, s.P[off+2*SysArch.PtrSize:], SysArch.PtrSize)) return int64(decodeInuxi(arch, s.P[off+2*arch.PtrSize:], arch.PtrSize))
} }
// InterfaceType.methods.length // InterfaceType.methods.length
func decodetypeIfaceMethodCount(arch *sys.Arch, s *Symbol) int64 { func decodetypeIfaceMethodCount(arch *sys.Arch, s *Symbol) int64 {
return int64(decodeInuxi(arch, s.P[commonsize()+2*SysArch.PtrSize:], SysArch.PtrSize)) return int64(decodeInuxi(arch, s.P[commonsize(arch)+2*arch.PtrSize:], arch.PtrSize))
} }
// methodsig is a fully qualified typed method signature, like // methodsig is a fully qualified typed method signature, like
...@@ -303,7 +303,7 @@ func decodeMethodSig(arch *sys.Arch, s *Symbol, off, size, count int) []methodsi ...@@ -303,7 +303,7 @@ func decodeMethodSig(arch *sys.Arch, s *Symbol, off, size, count int) []methodsi
if i > 0 { if i > 0 {
buf.WriteString(", ") buf.WriteString(", ")
} }
buf.WriteString(decodetypeFuncInType(mtypSym, i).Name) buf.WriteString(decodetypeFuncInType(arch, mtypSym, i).Name)
} }
buf.WriteString(") (") buf.WriteString(") (")
outCount := decodetypeFuncOutCount(arch, mtypSym) outCount := decodetypeFuncOutCount(arch, mtypSym)
...@@ -323,10 +323,10 @@ func decodeMethodSig(arch *sys.Arch, s *Symbol, off, size, count int) []methodsi ...@@ -323,10 +323,10 @@ func decodeMethodSig(arch *sys.Arch, s *Symbol, off, size, count int) []methodsi
} }
func decodeIfaceMethods(arch *sys.Arch, s *Symbol) []methodsig { func decodeIfaceMethods(arch *sys.Arch, s *Symbol) []methodsig {
if decodetypeKind(s)&kindMask != kindInterface { if decodetypeKind(arch, s)&kindMask != kindInterface {
panic(fmt.Sprintf("symbol %q is not an interface", s.Name)) panic(fmt.Sprintf("symbol %q is not an interface", s.Name))
} }
r := decodeReloc(s, int32(commonsize()+SysArch.PtrSize)) r := decodeReloc(s, int32(commonsize(arch)+arch.PtrSize))
if r == nil { if r == nil {
return nil return nil
} }
...@@ -340,27 +340,27 @@ func decodeIfaceMethods(arch *sys.Arch, s *Symbol) []methodsig { ...@@ -340,27 +340,27 @@ func decodeIfaceMethods(arch *sys.Arch, s *Symbol) []methodsig {
} }
func decodetypeMethods(arch *sys.Arch, s *Symbol) []methodsig { func decodetypeMethods(arch *sys.Arch, s *Symbol) []methodsig {
if !decodetypeHasUncommon(s) { if !decodetypeHasUncommon(arch, s) {
panic(fmt.Sprintf("no methods on %q", s.Name)) panic(fmt.Sprintf("no methods on %q", s.Name))
} }
off := commonsize() // reflect.rtype off := commonsize(arch) // reflect.rtype
switch decodetypeKind(s) & kindMask { switch decodetypeKind(arch, s) & kindMask {
case kindStruct: // reflect.structType case kindStruct: // reflect.structType
off += 4 * SysArch.PtrSize off += 4 * arch.PtrSize
case kindPtr: // reflect.ptrType case kindPtr: // reflect.ptrType
off += SysArch.PtrSize off += arch.PtrSize
case kindFunc: // reflect.funcType case kindFunc: // reflect.funcType
off += SysArch.PtrSize // 4 bytes, pointer aligned off += arch.PtrSize // 4 bytes, pointer aligned
case kindSlice: // reflect.sliceType case kindSlice: // reflect.sliceType
off += SysArch.PtrSize off += arch.PtrSize
case kindArray: // reflect.arrayType case kindArray: // reflect.arrayType
off += 3 * SysArch.PtrSize off += 3 * arch.PtrSize
case kindChan: // reflect.chanType case kindChan: // reflect.chanType
off += 2 * SysArch.PtrSize off += 2 * arch.PtrSize
case kindMap: // reflect.mapType case kindMap: // reflect.mapType
off += 4*SysArch.PtrSize + 8 off += 4*arch.PtrSize + 8
case kindInterface: // reflect.interfaceType case kindInterface: // reflect.interfaceType
off += 3 * SysArch.PtrSize off += 3 * arch.PtrSize
default: default:
// just Sizeof(rtype) // just Sizeof(rtype)
} }
......
src/cmd/link/internal/ld/dwarf.go
View file @ 5d95de20
...@@ -27,7 +27,7 @@ type dwctxt struct { ...@@ -27,7 +27,7 @@ type dwctxt struct {
} }
func (c dwctxt) PtrSize() int { func (c dwctxt) PtrSize() int {
return SysArch.PtrSize return c.linkctxt.Arch.PtrSize
} }
func (c dwctxt) AddInt(s dwarf.Sym, size int, i int64) { func (c dwctxt) AddInt(s dwarf.Sym, size int, i int64) {
ls := s.(*Symbol) ls := s.(*Symbol)
...@@ -57,7 +57,7 @@ func (c dwctxt) AddSectionOffset(s dwarf.Sym, size int, t interface{}, ofs int64 ...@@ -57,7 +57,7 @@ func (c dwctxt) AddSectionOffset(s dwarf.Sym, size int, t interface{}, ofs int64
default: default:
Errorf(ls, "invalid size %d in adddwarfref\n", size) Errorf(ls, "invalid size %d in adddwarfref\n", size)
fallthrough fallthrough
case SysArch.PtrSize: case c.linkctxt.Arch.PtrSize:
Addaddr(c.linkctxt, ls, t.(*Symbol)) Addaddr(c.linkctxt, ls, t.(*Symbol))
case 4: case 4:
addaddrplus4(c.linkctxt, ls, t.(*Symbol), 0) addaddrplus4(c.linkctxt, ls, t.(*Symbol), 0)
...@@ -211,7 +211,7 @@ func adddwarfref(ctxt *Link, s *Symbol, t *Symbol, size int) int64 { ...@@ -211,7 +211,7 @@ func adddwarfref(ctxt *Link, s *Symbol, t *Symbol, size int) int64 {
default: default:
Errorf(s, "invalid size %d in adddwarfref\n", size) Errorf(s, "invalid size %d in adddwarfref\n", size)
fallthrough fallthrough
case SysArch.PtrSize: case ctxt.Arch.PtrSize:
result = Addaddr(ctxt, s, t) result = Addaddr(ctxt, s, t)
case 4: case 4:
result = addaddrplus4(ctxt, s, t, 0) result = addaddrplus4(ctxt, s, t, 0)
...@@ -362,7 +362,7 @@ func defgotype(ctxt *Link, gotype *Symbol) *Symbol { ...@@ -362,7 +362,7 @@ func defgotype(ctxt *Link, gotype *Symbol) *Symbol {
func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
name := gotype.Name[5:] // could also decode from Type.string name := gotype.Name[5:] // could also decode from Type.string
kind := decodetypeKind(gotype) kind := decodetypeKind(ctxt.Arch, gotype)
bytesize := decodetypeSize(ctxt.Arch, gotype) bytesize := decodetypeSize(ctxt.Arch, gotype)
var die *dwarf.DWDie var die *dwarf.DWDie
...@@ -407,7 +407,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -407,7 +407,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_ARRAYTYPE, name, 0) die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_ARRAYTYPE, name, 0)
dotypedef(ctxt, &dwtypes, name, die) dotypedef(ctxt, &dwtypes, name, die)
newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0) newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0)
s := decodetypeArrayElem(gotype) s := decodetypeArrayElem(ctxt.Arch, gotype)
newrefattr(die, dwarf.DW_AT_type, defgotype(ctxt, s)) newrefattr(die, dwarf.DW_AT_type, defgotype(ctxt, s))
fld := newdie(ctxt, die, dwarf.DW_ABRV_ARRAYRANGE, "range", 0) fld := newdie(ctxt, die, dwarf.DW_ABRV_ARRAYRANGE, "range", 0)
...@@ -419,7 +419,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -419,7 +419,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
case objabi.KindChan: case objabi.KindChan:
die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_CHANTYPE, name, 0) die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_CHANTYPE, name, 0)
newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0) newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0)
s := decodetypeChanElem(gotype) s := decodetypeChanElem(ctxt.Arch, gotype)
newrefattr(die, dwarf.DW_AT_go_elem, defgotype(ctxt, s)) newrefattr(die, dwarf.DW_AT_go_elem, defgotype(ctxt, s))
// Save elem type for synthesizechantypes. We could synthesize here // Save elem type for synthesizechantypes. We could synthesize here
// but that would change the order of DIEs we output. // but that would change the order of DIEs we output.
...@@ -434,7 +434,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -434,7 +434,7 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
var fld *dwarf.DWDie var fld *dwarf.DWDie
var s *Symbol var s *Symbol
for i := 0; i < nfields; i++ { for i := 0; i < nfields; i++ {
s = decodetypeFuncInType(gotype, i) s = decodetypeFuncInType(ctxt.Arch, gotype, i)
fld = newdie(ctxt, die, dwarf.DW_ABRV_FUNCTYPEPARAM, s.Name[5:], 0) fld = newdie(ctxt, die, dwarf.DW_ABRV_FUNCTYPEPARAM, s.Name[5:], 0)
newrefattr(fld, dwarf.DW_AT_type, defgotype(ctxt, s)) newrefattr(fld, dwarf.DW_AT_type, defgotype(ctxt, s))
} }
...@@ -464,9 +464,9 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -464,9 +464,9 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
case objabi.KindMap: case objabi.KindMap:
die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_MAPTYPE, name, 0) die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_MAPTYPE, name, 0)
s := decodetypeMapKey(gotype) s := decodetypeMapKey(ctxt.Arch, gotype)
newrefattr(die, dwarf.DW_AT_go_key, defgotype(ctxt, s)) newrefattr(die, dwarf.DW_AT_go_key, defgotype(ctxt, s))
s = decodetypeMapValue(gotype) s = decodetypeMapValue(ctxt.Arch, gotype)
newrefattr(die, dwarf.DW_AT_go_elem, defgotype(ctxt, s)) newrefattr(die, dwarf.DW_AT_go_elem, defgotype(ctxt, s))
// Save gotype for use in synthesizemaptypes. We could synthesize here, // Save gotype for use in synthesizemaptypes. We could synthesize here,
// but that would change the order of the DIEs. // but that would change the order of the DIEs.
...@@ -475,14 +475,14 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -475,14 +475,14 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
case objabi.KindPtr: case objabi.KindPtr:
die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_PTRTYPE, name, 0) die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_PTRTYPE, name, 0)
dotypedef(ctxt, &dwtypes, name, die) dotypedef(ctxt, &dwtypes, name, die)
s := decodetypePtrElem(gotype) s := decodetypePtrElem(ctxt.Arch, gotype)
newrefattr(die, dwarf.DW_AT_type, defgotype(ctxt, s)) newrefattr(die, dwarf.DW_AT_type, defgotype(ctxt, s))
case objabi.KindSlice: case objabi.KindSlice:
die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_SLICETYPE, name, 0) die = newdie(ctxt, &dwtypes, dwarf.DW_ABRV_SLICETYPE, name, 0)
dotypedef(ctxt, &dwtypes, name, die) dotypedef(ctxt, &dwtypes, name, die)
newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0) newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0)
s := decodetypeArrayElem(gotype) s := decodetypeArrayElem(ctxt.Arch, gotype)
elem := defgotype(ctxt, s) elem := defgotype(ctxt, s)
newrefattr(die, dwarf.DW_AT_go_elem, elem) newrefattr(die, dwarf.DW_AT_go_elem, elem)
...@@ -496,8 +496,8 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie { ...@@ -496,8 +496,8 @@ func newtype(ctxt *Link, gotype *Symbol) *dwarf.DWDie {
newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0) newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, bytesize, 0)
nfields := decodetypeStructFieldCount(ctxt.Arch, gotype) nfields := decodetypeStructFieldCount(ctxt.Arch, gotype)
for i := 0; i < nfields; i++ { for i := 0; i < nfields; i++ {
f := decodetypeStructFieldName(gotype, i) f := decodetypeStructFieldName(ctxt.Arch, gotype, i)
s := decodetypeStructFieldType(gotype, i) s := decodetypeStructFieldType(ctxt.Arch, gotype, i)
if f == "" { if f == "" {
f = s.Name[5:] // skip "type." f = s.Name[5:] // skip "type."
} }
...@@ -668,19 +668,19 @@ func synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) { ...@@ -668,19 +668,19 @@ func synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) {
continue continue
} }
gotype := getattr(die, dwarf.DW_AT_type).Data.(*Symbol) gotype := getattr(die, dwarf.DW_AT_type).Data.(*Symbol)
keytype := decodetypeMapKey(gotype) keytype := decodetypeMapKey(ctxt.Arch, gotype)
valtype := decodetypeMapValue(gotype) valtype := decodetypeMapValue(ctxt.Arch, gotype)
keysize, valsize := decodetypeSize(ctxt.Arch, keytype), decodetypeSize(ctxt.Arch, valtype) keysize, valsize := decodetypeSize(ctxt.Arch, keytype), decodetypeSize(ctxt.Arch, valtype)
keytype, valtype = walksymtypedef(ctxt, defgotype(ctxt, keytype)), walksymtypedef(ctxt, defgotype(ctxt, valtype)) keytype, valtype = walksymtypedef(ctxt, defgotype(ctxt, keytype)), walksymtypedef(ctxt, defgotype(ctxt, valtype))
// compute size info like hashmap.c does. // compute size info like hashmap.c does.
indirectKey, indirectVal := false, false indirectKey, indirectVal := false, false
if keysize > MaxKeySize { if keysize > MaxKeySize {
keysize = int64(SysArch.PtrSize) keysize = int64(ctxt.Arch.PtrSize)
indirectKey = true indirectKey = true
} }
if valsize > MaxValSize { if valsize > MaxValSize {
valsize = int64(SysArch.PtrSize) valsize = int64(ctxt.Arch.PtrSize)
indirectVal = true indirectVal = true
} }
...@@ -727,13 +727,13 @@ func synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) { ...@@ -727,13 +727,13 @@ func synthesizemaptypes(ctxt *Link, die *dwarf.DWDie) {
fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "overflow", 0) fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "overflow", 0)
newrefattr(fld, dwarf.DW_AT_type, defptrto(ctxt, dtolsym(dwhb.Sym))) newrefattr(fld, dwarf.DW_AT_type, defptrto(ctxt, dtolsym(dwhb.Sym)))
newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize))) newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize)))
if SysArch.RegSize > SysArch.PtrSize { if ctxt.Arch.RegSize > ctxt.Arch.PtrSize {
fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "pad", 0) fld = newdie(ctxt, dwhb, dwarf.DW_ABRV_STRUCTFIELD, "pad", 0)
newrefattr(fld, dwarf.DW_AT_type, mustFind(ctxt, "uintptr")) newrefattr(fld, dwarf.DW_AT_type, mustFind(ctxt, "uintptr"))
newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize))+int32(SysArch.PtrSize)) newmemberoffsetattr(fld, BucketSize+BucketSize*(int32(keysize)+int32(valsize))+int32(ctxt.Arch.PtrSize))
} }
newattr(dwhb, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, BucketSize+BucketSize*keysize+BucketSize*valsize+int64(SysArch.RegSize), 0) newattr(dwhb, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, BucketSize+BucketSize*keysize+BucketSize*valsize+int64(ctxt.Arch.RegSize), 0)
}) })
// Construct hash<K,V> // Construct hash<K,V>
...@@ -1060,7 +1060,7 @@ func writelines(ctxt *Link, syms []*Symbol) ([]*Symbol, []*Symbol) { ...@@ -1060,7 +1060,7 @@ func writelines(ctxt *Link, syms []*Symbol) ([]*Symbol, []*Symbol) {
headerend = ls.Size headerend = ls.Size
Adduint8(ctxt, ls, 0) // start extended opcode Adduint8(ctxt, ls, 0) // start extended opcode
dwarf.Uleb128put(dwarfctxt, ls, 1+int64(SysArch.PtrSize)) dwarf.Uleb128put(dwarfctxt, ls, 1+int64(ctxt.Arch.PtrSize))
Adduint8(ctxt, ls, dwarf.DW_LNE_set_address) Adduint8(ctxt, ls, dwarf.DW_LNE_set_address)
pc := s.Value pc := s.Value
...@@ -1189,11 +1189,11 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1189,11 +1189,11 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol {
dwarf.Uleb128put(dwarfctxt, fs, int64(Thearch.Dwarfregsp)) // ...of the platform's SP register... dwarf.Uleb128put(dwarfctxt, fs, int64(Thearch.Dwarfregsp)) // ...of the platform's SP register...
dwarf.Uleb128put(dwarfctxt, fs, int64(0)) // ...is CFA+0. dwarf.Uleb128put(dwarfctxt, fs, int64(0)) // ...is CFA+0.
} else { } else {
dwarf.Uleb128put(dwarfctxt, fs, int64(SysArch.PtrSize)) // ...plus the word size (because the call instruction implicitly adds one word to the frame). dwarf.Uleb128put(dwarfctxt, fs, int64(ctxt.Arch.PtrSize)) // ...plus the word size (because the call instruction implicitly adds one word to the frame).
Adduint8(ctxt, fs, dwarf.DW_CFA_offset_extended) // The previous value... Adduint8(ctxt, fs, dwarf.DW_CFA_offset_extended) // The previous value...
dwarf.Uleb128put(dwarfctxt, fs, int64(Thearch.Dwarfreglr)) // ...of the return address... dwarf.Uleb128put(dwarfctxt, fs, int64(Thearch.Dwarfreglr)) // ...of the return address...
dwarf.Uleb128put(dwarfctxt, fs, int64(-SysArch.PtrSize)/dataAlignmentFactor) // ...is saved at [CFA - (PtrSize/4)]. dwarf.Uleb128put(dwarfctxt, fs, int64(-ctxt.Arch.PtrSize)/dataAlignmentFactor) // ...is saved at [CFA - (PtrSize/4)].
} }
// 4 is to exclude the length field. // 4 is to exclude the length field.
...@@ -1245,10 +1245,10 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1245,10 +1245,10 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol {
} }
deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(pcsp.value)) deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(pcsp.value))
} else { } else {
deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(SysArch.PtrSize)+int64(pcsp.value)) deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(ctxt.Arch.PtrSize)+int64(pcsp.value))
} }
} }
pad := int(Rnd(int64(len(deltaBuf)), int64(SysArch.PtrSize))) - len(deltaBuf) pad := int(Rnd(int64(len(deltaBuf)), int64(ctxt.Arch.PtrSize))) - len(deltaBuf)
deltaBuf = append(deltaBuf, zeros[:pad]...) deltaBuf = append(deltaBuf, zeros[:pad]...)
// Emit the FDE header, Section 6.4.1. // Emit the FDE header, Section 6.4.1.
...@@ -1256,14 +1256,14 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1256,14 +1256,14 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol {
// 4 bytes: Pointer to the CIE above, at offset 0 // 4 bytes: Pointer to the CIE above, at offset 0
// ptrsize: initial location // ptrsize: initial location
// ptrsize: address range // ptrsize: address range
Adduint32(ctxt, fs, uint32(4+2*SysArch.PtrSize+len(deltaBuf))) // length (excludes itself) Adduint32(ctxt, fs, uint32(4+2*ctxt.Arch.PtrSize+len(deltaBuf))) // length (excludes itself)
if Linkmode == LinkExternal { if Linkmode == LinkExternal {
adddwarfref(ctxt, fs, fs, 4) adddwarfref(ctxt, fs, fs, 4)
} else { } else {
Adduint32(ctxt, fs, 0) // CIE offset Adduint32(ctxt, fs, 0) // CIE offset
} }
Addaddr(ctxt, fs, s) Addaddr(ctxt, fs, s)
adduintxx(ctxt, fs, uint64(s.Size), SysArch.PtrSize) // address range adduintxx(ctxt, fs, uint64(s.Size), ctxt.Arch.PtrSize) // address range
Addbytes(fs, deltaBuf) Addbytes(fs, deltaBuf)
} }
return syms return syms
...@@ -1324,7 +1324,7 @@ func writeinfo(ctxt *Link, syms []*Symbol, funcs, consts []*Symbol, abbrevsym *S ...@@ -1324,7 +1324,7 @@ func writeinfo(ctxt *Link, syms []*Symbol, funcs, consts []*Symbol, abbrevsym *S
// debug_abbrev_offset (*) // debug_abbrev_offset (*)
adddwarfref(ctxt, s, abbrevsym, 4) adddwarfref(ctxt, s, abbrevsym, 4)
Adduint8(ctxt, s, uint8(SysArch.PtrSize)) // address_size Adduint8(ctxt, s, uint8(ctxt.Arch.PtrSize)) // address_size
dwarf.Uleb128put(dwarfctxt, s, int64(compunit.Abbrev)) dwarf.Uleb128put(dwarfctxt, s, int64(compunit.Abbrev))
dwarf.PutAttrs(dwarfctxt, s, compunit.Abbrev, compunit.Attr) dwarf.PutAttrs(dwarfctxt, s, compunit.Abbrev, compunit.Attr)
...@@ -1414,7 +1414,7 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1414,7 +1414,7 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol {
s.Type = SDWARFSECT s.Type = SDWARFSECT
// The first tuple is aligned to a multiple of the size of a single tuple // The first tuple is aligned to a multiple of the size of a single tuple
// (twice the size of an address) // (twice the size of an address)
headersize := int(Rnd(4+2+4+1+1, int64(SysArch.PtrSize*2))) // don't count unit_length field itself headersize := int(Rnd(4+2+4+1+1, int64(ctxt.Arch.PtrSize*2))) // don't count unit_length field itself
for compunit := dwroot.Child; compunit != nil; compunit = compunit.Link { for compunit := dwroot.Child; compunit != nil; compunit = compunit.Link {
b := getattr(compunit, dwarf.DW_AT_low_pc) b := getattr(compunit, dwarf.DW_AT_low_pc)
...@@ -1427,13 +1427,13 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1427,13 +1427,13 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol {
} }
// Write .debug_aranges Header + entry (sec 6.1.2) // Write .debug_aranges Header + entry (sec 6.1.2)
unitlength := uint32(headersize) + 4*uint32(SysArch.PtrSize) - 4 unitlength := uint32(headersize) + 4*uint32(ctxt.Arch.PtrSize) - 4
Adduint32(ctxt, s, unitlength) // unit_length (*) Adduint32(ctxt, s, unitlength) // unit_length (*)
Adduint16(ctxt, s, 2) // dwarf version (appendix F) Adduint16(ctxt, s, 2) // dwarf version (appendix F)
adddwarfref(ctxt, s, dtolsym(compunit.Sym), 4) adddwarfref(ctxt, s, dtolsym(compunit.Sym), 4)
Adduint8(ctxt, s, uint8(SysArch.PtrSize)) // address_size Adduint8(ctxt, s, uint8(ctxt.Arch.PtrSize)) // address_size
Adduint8(ctxt, s, 0) // segment_size Adduint8(ctxt, s, 0) // segment_size
padding := headersize - (4 + 2 + 4 + 1 + 1) padding := headersize - (4 + 2 + 4 + 1 + 1)
for i := 0; i < padding; i++ { for i := 0; i < padding; i++ {
...@@ -1441,9 +1441,9 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1441,9 +1441,9 @@ func writearanges(ctxt *Link, syms []*Symbol) []*Symbol {
} }
Addaddrplus(ctxt, s, b.Data.(*Symbol), b.Value-(b.Data.(*Symbol)).Value) Addaddrplus(ctxt, s, b.Data.(*Symbol), b.Value-(b.Data.(*Symbol)).Value)
adduintxx(ctxt, s, uint64(e.Value-b.Value), SysArch.PtrSize) adduintxx(ctxt, s, uint64(e.Value-b.Value), ctxt.Arch.PtrSize)
adduintxx(ctxt, s, 0, SysArch.PtrSize) adduintxx(ctxt, s, 0, ctxt.Arch.PtrSize)
adduintxx(ctxt, s, 0, SysArch.PtrSize) adduintxx(ctxt, s, 0, ctxt.Arch.PtrSize)
} }
if s.Size > 0 { if s.Size > 0 {
syms = append(syms, s) syms = append(syms, s)
...@@ -1520,7 +1520,7 @@ func dwarfgeneratedebugsyms(ctxt *Link) { ...@@ -1520,7 +1520,7 @@ func dwarfgeneratedebugsyms(ctxt *Link) {
die := newdie(ctxt, &dwtypes, dwarf.DW_ABRV_BASETYPE, "uintptr", 0) // needed for array size die := newdie(ctxt, &dwtypes, dwarf.DW_ABRV_BASETYPE, "uintptr", 0) // needed for array size
newattr(die, dwarf.DW_AT_encoding, dwarf.DW_CLS_CONSTANT, dwarf.DW_ATE_unsigned, 0) newattr(die, dwarf.DW_AT_encoding, dwarf.DW_CLS_CONSTANT, dwarf.DW_ATE_unsigned, 0)
newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, int64(SysArch.PtrSize), 0) newattr(die, dwarf.DW_AT_byte_size, dwarf.DW_CLS_CONSTANT, int64(ctxt.Arch.PtrSize), 0)
newattr(die, dwarf.DW_AT_go_kind, dwarf.DW_CLS_CONSTANT, objabi.KindUintptr, 0) newattr(die, dwarf.DW_AT_go_kind, dwarf.DW_CLS_CONSTANT, objabi.KindUintptr, 0)
// Prototypes needed for type synthesis. // Prototypes needed for type synthesis.
......
src/cmd/link/internal/ld/elf.go
View file @ 5d95de20
...@@ -919,13 +919,13 @@ var buildinfo []byte ...@@ -919,13 +919,13 @@ var buildinfo []byte
func Elfinit(ctxt *Link) { func Elfinit(ctxt *Link) {
Iself = true Iself = true
if SysArch.InFamily(sys.AMD64, sys.ARM64, sys.MIPS64, sys.PPC64, sys.S390X) { if ctxt.Arch.InFamily(sys.AMD64, sys.ARM64, sys.MIPS64, sys.PPC64, sys.S390X) {
elfRelType = ".rela" elfRelType = ".rela"
} else { } else {
elfRelType = ".rel" elfRelType = ".rel"
} }
switch SysArch.Family { switch ctxt.Arch.Family {
// 64-bit architectures // 64-bit architectures
case sys.PPC64, sys.S390X: case sys.PPC64, sys.S390X:
if ctxt.Arch.ByteOrder == binary.BigEndian { if ctxt.Arch.ByteOrder == binary.BigEndian {
...@@ -935,7 +935,7 @@ func Elfinit(ctxt *Link) { ...@@ -935,7 +935,7 @@ func Elfinit(ctxt *Link) {
} }
fallthrough fallthrough
case sys.AMD64, sys.ARM64, sys.MIPS64: case sys.AMD64, sys.ARM64, sys.MIPS64:
if SysArch.Family == sys.MIPS64 { if ctxt.Arch.Family == sys.MIPS64 {
ehdr.flags = 0x20000004 /* MIPS 3 CPIC */ ehdr.flags = 0x20000004 /* MIPS 3 CPIC */
} }
elf64 = true elf64 = true
...@@ -948,7 +948,7 @@ func Elfinit(ctxt *Link) { ...@@ -948,7 +948,7 @@ func Elfinit(ctxt *Link) {
// 32-bit architectures // 32-bit architectures
case sys.ARM, sys.MIPS: case sys.ARM, sys.MIPS:
if SysArch.Family == sys.ARM { if ctxt.Arch.Family == sys.ARM {
// we use EABI on linux/arm, freebsd/arm, netbsd/arm. // we use EABI on linux/arm, freebsd/arm, netbsd/arm.
if Headtype == objabi.Hlinux || Headtype == objabi.Hfreebsd || Headtype == objabi.Hnetbsd { if Headtype == objabi.Hlinux || Headtype == objabi.Hfreebsd || Headtype == objabi.Hnetbsd {
// We set a value here that makes no indication of which // We set a value here that makes no indication of which
...@@ -961,7 +961,7 @@ func Elfinit(ctxt *Link) { ...@@ -961,7 +961,7 @@ func Elfinit(ctxt *Link) {
// appropriate. // appropriate.
ehdr.flags = 0x5000002 // has entry point, Version5 EABI ehdr.flags = 0x5000002 // has entry point, Version5 EABI
} }
} else if SysArch.Family == sys.MIPS { } else if ctxt.Arch.Family == sys.MIPS {
ehdr.flags = 0x50001004 /* MIPS 32 CPIC O32*/ ehdr.flags = 0x50001004 /* MIPS 32 CPIC O32*/
} }
fallthrough fallthrough
...@@ -1480,7 +1480,7 @@ func elfdynhash(ctxt *Link) { ...@@ -1480,7 +1480,7 @@ func elfdynhash(ctxt *Link) {
} }
// s390x (ELF64) hash table entries are 8 bytes // s390x (ELF64) hash table entries are 8 bytes
if SysArch.Family == sys.S390X { if ctxt.Arch.Family == sys.S390X {
Adduint64(ctxt, s, uint64(nbucket)) Adduint64(ctxt, s, uint64(nbucket))
Adduint64(ctxt, s, uint64(nsym)) Adduint64(ctxt, s, uint64(nsym))
for i := 0; i < nbucket; i++ { for i := 0; i < nbucket; i++ {
...@@ -1713,7 +1713,7 @@ func elfshbits(sect *Section) *ElfShdr { ...@@ -1713,7 +1713,7 @@ func elfshbits(sect *Section) *ElfShdr {
return sh return sh
} }
func elfshreloc(sect *Section) *ElfShdr { func elfshreloc(arch *sys.Arch, sect *Section) *ElfShdr {
// If main section is SHT_NOBITS, nothing to relocate. // If main section is SHT_NOBITS, nothing to relocate.
// Also nothing to relocate in .shstrtab or notes. // Also nothing to relocate in .shstrtab or notes.
if sect.Vaddr >= sect.Seg.Vaddr+sect.Seg.Filelen { if sect.Vaddr >= sect.Seg.Vaddr+sect.Seg.Filelen {
...@@ -1744,15 +1744,15 @@ func elfshreloc(sect *Section) *ElfShdr { ...@@ -1744,15 +1744,15 @@ func elfshreloc(sect *Section) *ElfShdr {
} }
sh.type_ = uint32(typ) sh.type_ = uint32(typ)
sh.entsize = uint64(SysArch.RegSize) * 2 sh.entsize = uint64(arch.RegSize) * 2
if typ == SHT_RELA { if typ == SHT_RELA {
sh.entsize += uint64(SysArch.RegSize) sh.entsize += uint64(arch.RegSize)
} }
sh.link = uint32(elfshname(".symtab").shnum) sh.link = uint32(elfshname(".symtab").shnum)
sh.info = uint32(sect.Elfsect.shnum) sh.info = uint32(sect.Elfsect.shnum)
sh.off = sect.Reloff sh.off = sect.Reloff
sh.size = sect.Rellen sh.size = sect.Rellen
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(arch.RegSize)
return sh return sh
} }
...@@ -1795,13 +1795,13 @@ func elfrelocsect(ctxt *Link, sect *Section, syms []*Symbol) { ...@@ -1795,13 +1795,13 @@ func elfrelocsect(ctxt *Link, sect *Section, syms []*Symbol) {
continue continue
} }
if r.Xsym.ElfsymForReloc() == 0 { if r.Xsym.ElfsymForReloc() == 0 {
Errorf(sym, "reloc %d (%s) to non-elf symbol %s (outer=%s) %d (%s)", r.Type, RelocName(r.Type), r.Sym.Name, r.Xsym.Name, r.Sym.Type, r.Sym.Type) Errorf(sym, "reloc %d (%s) to non-elf symbol %s (outer=%s) %d (%s)", r.Type, RelocName(ctxt.Arch, r.Type), r.Sym.Name, r.Xsym.Name, r.Sym.Type, r.Sym.Type)
} }
if !r.Xsym.Attr.Reachable() { if !r.Xsym.Attr.Reachable() {
Errorf(sym, "unreachable reloc %d (%s) target %v", r.Type, RelocName(r.Type), r.Xsym.Name) Errorf(sym, "unreachable reloc %d (%s) target %v", r.Type, RelocName(ctxt.Arch, r.Type), r.Xsym.Name)
} }
if !Thearch.Elfreloc1(ctxt, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) { if !Thearch.Elfreloc1(ctxt, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) {
Errorf(sym, "unsupported obj reloc %d (%s)/%d to %s", r.Type, RelocName(r.Type), r.Siz, r.Sym.Name) Errorf(sym, "unsupported obj reloc %d (%s)/%d to %s", r.Type, RelocName(ctxt.Arch, r.Type), r.Siz, r.Sym.Name)
} }
} }
} }
...@@ -1959,7 +1959,7 @@ func (ctxt *Link) doelf() { ...@@ -1959,7 +1959,7 @@ func (ctxt *Link) doelf() {
Addstring(shstrtab, ".interp") Addstring(shstrtab, ".interp")
Addstring(shstrtab, ".hash") Addstring(shstrtab, ".hash")
Addstring(shstrtab, ".got") Addstring(shstrtab, ".got")
if SysArch.Family == sys.PPC64 { if ctxt.Arch.Family == sys.PPC64 {
Addstring(shstrtab, ".glink") Addstring(shstrtab, ".glink")
} }
Addstring(shstrtab, ".got.plt") Addstring(shstrtab, ".got.plt")
...@@ -2006,7 +2006,7 @@ func (ctxt *Link) doelf() { ...@@ -2006,7 +2006,7 @@ func (ctxt *Link) doelf() {
s.Type = SELFGOT // writable s.Type = SELFGOT // writable
/* ppc64 glink resolver */ /* ppc64 glink resolver */
if SysArch.Family == sys.PPC64 { if ctxt.Arch.Family == sys.PPC64 {
s := ctxt.Syms.Lookup(".glink", 0) s := ctxt.Syms.Lookup(".glink", 0)
s.Attr |= AttrReachable s.Attr |= AttrReachable
s.Type = SELFRXSECT s.Type = SELFRXSECT
...@@ -2025,7 +2025,7 @@ func (ctxt *Link) doelf() { ...@@ -2025,7 +2025,7 @@ func (ctxt *Link) doelf() {
s = ctxt.Syms.Lookup(".plt", 0) s = ctxt.Syms.Lookup(".plt", 0)
s.Attr |= AttrReachable s.Attr |= AttrReachable
if SysArch.Family == sys.PPC64 { if ctxt.Arch.Family == sys.PPC64 {
// In the ppc64 ABI, .plt is a data section // In the ppc64 ABI, .plt is a data section
// written by the dynamic linker. // written by the dynamic linker.
s.Type = SELFSECT s.Type = SELFSECT
...@@ -2080,15 +2080,15 @@ func (ctxt *Link) doelf() { ...@@ -2080,15 +2080,15 @@ func (ctxt *Link) doelf() {
Elfwritedynent(ctxt, s, DT_RUNPATH, uint64(Addstring(dynstr, rpath.val))) Elfwritedynent(ctxt, s, DT_RUNPATH, uint64(Addstring(dynstr, rpath.val)))
} }
if SysArch.Family == sys.PPC64 { if ctxt.Arch.Family == sys.PPC64 {
elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".plt", 0)) elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".plt", 0))
} else if SysArch.Family == sys.S390X { } else if ctxt.Arch.Family == sys.S390X {
elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".got", 0)) elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".got", 0))
} else { } else {
elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".got.plt", 0)) elfwritedynentsym(ctxt, s, DT_PLTGOT, ctxt.Syms.Lookup(".got.plt", 0))
} }
if SysArch.Family == sys.PPC64 { if ctxt.Arch.Family == sys.PPC64 {
Elfwritedynent(ctxt, s, DT_PPC64_OPT, 0) Elfwritedynent(ctxt, s, DT_PPC64_OPT, 0)
} }
...@@ -2178,9 +2178,9 @@ func Asmbelfsetup() { ...@@ -2178,9 +2178,9 @@ func Asmbelfsetup() {
func Asmbelf(ctxt *Link, symo int64) { func Asmbelf(ctxt *Link, symo int64) {
eh := getElfEhdr() eh := getElfEhdr()
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Exitf("unknown architecture in asmbelf: %v", SysArch.Family) Exitf("unknown architecture in asmbelf: %v", ctxt.Arch.Family)
case sys.MIPS, sys.MIPS64: case sys.MIPS, sys.MIPS64:
eh.machine = EM_MIPS eh.machine = EM_MIPS
case sys.ARM: case sys.ARM:
...@@ -2370,7 +2370,7 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2370,7 +2370,7 @@ func Asmbelf(ctxt *Link, symo int64) {
} else { } else {
sh.entsize = ELF32SYMSIZE sh.entsize = ELF32SYMSIZE
} }
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.link = uint32(elfshname(".dynstr").shnum) sh.link = uint32(elfshname(".dynstr").shnum)
// sh->info = index of first non-local symbol (number of local symbols) // sh->info = index of first non-local symbol (number of local symbols)
...@@ -2394,7 +2394,7 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2394,7 +2394,7 @@ func Asmbelf(ctxt *Link, symo int64) {
sh = elfshname(".gnu.version_r") sh = elfshname(".gnu.version_r")
sh.type_ = SHT_GNU_VERNEED sh.type_ = SHT_GNU_VERNEED
sh.flags = SHF_ALLOC sh.flags = SHF_ALLOC
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.info = uint32(elfverneed) sh.info = uint32(elfverneed)
sh.link = uint32(elfshname(".dynstr").shnum) sh.link = uint32(elfshname(".dynstr").shnum)
shsym(sh, ctxt.Syms.Lookup(".gnu.version_r", 0)) shsym(sh, ctxt.Syms.Lookup(".gnu.version_r", 0))
...@@ -2405,7 +2405,7 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2405,7 +2405,7 @@ func Asmbelf(ctxt *Link, symo int64) {
sh.type_ = SHT_RELA sh.type_ = SHT_RELA
sh.flags = SHF_ALLOC sh.flags = SHF_ALLOC
sh.entsize = ELF64RELASIZE sh.entsize = ELF64RELASIZE
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.link = uint32(elfshname(".dynsym").shnum) sh.link = uint32(elfshname(".dynsym").shnum)
sh.info = uint32(elfshname(".plt").shnum) sh.info = uint32(elfshname(".plt").shnum)
shsym(sh, ctxt.Syms.Lookup(".rela.plt", 0)) shsym(sh, ctxt.Syms.Lookup(".rela.plt", 0))
...@@ -2469,15 +2469,15 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2469,15 +2469,15 @@ func Asmbelf(ctxt *Link, symo int64) {
sh := elfshname(".got") sh := elfshname(".got")
sh.type_ = SHT_PROGBITS sh.type_ = SHT_PROGBITS
sh.flags = SHF_ALLOC + SHF_WRITE sh.flags = SHF_ALLOC + SHF_WRITE
sh.entsize = uint64(SysArch.RegSize) sh.entsize = uint64(ctxt.Arch.RegSize)
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
shsym(sh, ctxt.Syms.Lookup(".got", 0)) shsym(sh, ctxt.Syms.Lookup(".got", 0))
sh = elfshname(".got.plt") sh = elfshname(".got.plt")
sh.type_ = SHT_PROGBITS sh.type_ = SHT_PROGBITS
sh.flags = SHF_ALLOC + SHF_WRITE sh.flags = SHF_ALLOC + SHF_WRITE
sh.entsize = uint64(SysArch.RegSize) sh.entsize = uint64(ctxt.Arch.RegSize)
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
shsym(sh, ctxt.Syms.Lookup(".got.plt", 0)) shsym(sh, ctxt.Syms.Lookup(".got.plt", 0))
} }
...@@ -2485,7 +2485,7 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2485,7 +2485,7 @@ func Asmbelf(ctxt *Link, symo int64) {
sh.type_ = SHT_HASH sh.type_ = SHT_HASH
sh.flags = SHF_ALLOC sh.flags = SHF_ALLOC
sh.entsize = 4 sh.entsize = 4
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.link = uint32(elfshname(".dynsym").shnum) sh.link = uint32(elfshname(".dynsym").shnum)
shsym(sh, ctxt.Syms.Lookup(".hash", 0)) shsym(sh, ctxt.Syms.Lookup(".hash", 0))
...@@ -2494,8 +2494,8 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2494,8 +2494,8 @@ func Asmbelf(ctxt *Link, symo int64) {
sh.type_ = SHT_DYNAMIC sh.type_ = SHT_DYNAMIC
sh.flags = SHF_ALLOC + SHF_WRITE sh.flags = SHF_ALLOC + SHF_WRITE
sh.entsize = 2 * uint64(SysArch.RegSize) sh.entsize = 2 * uint64(ctxt.Arch.RegSize)
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.link = uint32(elfshname(".dynstr").shnum) sh.link = uint32(elfshname(".dynstr").shnum)
shsym(sh, ctxt.Syms.Lookup(".dynamic", 0)) shsym(sh, ctxt.Syms.Lookup(".dynamic", 0))
ph := newElfPhdr() ph := newElfPhdr()
...@@ -2517,7 +2517,7 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2517,7 +2517,7 @@ func Asmbelf(ctxt *Link, symo int64) {
ph.type_ = PT_TLS ph.type_ = PT_TLS
ph.flags = PF_R ph.flags = PF_R
ph.memsz = tlssize ph.memsz = tlssize
ph.align = uint64(SysArch.RegSize) ph.align = uint64(ctxt.Arch.RegSize)
} }
} }
...@@ -2525,12 +2525,12 @@ func Asmbelf(ctxt *Link, symo int64) { ...@@ -2525,12 +2525,12 @@ func Asmbelf(ctxt *Link, symo int64) {
ph := newElfPhdr() ph := newElfPhdr()
ph.type_ = PT_GNU_STACK ph.type_ = PT_GNU_STACK
ph.flags = PF_W + PF_R ph.flags = PF_W + PF_R
ph.align = uint64(SysArch.RegSize) ph.align = uint64(ctxt.Arch.RegSize)
ph = newElfPhdr() ph = newElfPhdr()
ph.type_ = PT_PAX_FLAGS ph.type_ = PT_PAX_FLAGS
ph.flags = 0x2a00 // mprotect, randexec, emutramp disabled ph.flags = 0x2a00 // mprotect, randexec, emutramp disabled
ph.align = uint64(SysArch.RegSize) ph.align = uint64(ctxt.Arch.RegSize)
} else if Headtype == objabi.Hsolaris { } else if Headtype == objabi.Hsolaris {
ph := newElfPhdr() ph := newElfPhdr()
ph.type_ = PT_SUNWSTACK ph.type_ = PT_SUNWSTACK
...@@ -2568,20 +2568,20 @@ elfobj: ...@@ -2568,20 +2568,20 @@ elfobj:
if Linkmode == LinkExternal { if Linkmode == LinkExternal {
for _, sect := range Segtext.Sections { for _, sect := range Segtext.Sections {
elfshreloc(sect) elfshreloc(ctxt.Arch, sect)
} }
for _, sect := range Segrodata.Sections { for _, sect := range Segrodata.Sections {
elfshreloc(sect) elfshreloc(ctxt.Arch, sect)
} }
for _, sect := range Segrelrodata.Sections { for _, sect := range Segrelrodata.Sections {
elfshreloc(sect) elfshreloc(ctxt.Arch, sect)
} }
for _, sect := range Segdata.Sections { for _, sect := range Segdata.Sections {
elfshreloc(sect) elfshreloc(ctxt.Arch, sect)
} }
for _, s := range dwarfp { for _, s := range dwarfp {
if len(s.R) > 0 || s.Type == SDWARFINFO || s.Type == SDWARFLOC { if len(s.R) > 0 || s.Type == SDWARFINFO || s.Type == SDWARFLOC {
elfshreloc(s.Sect) elfshreloc(ctxt.Arch, s.Sect)
} }
} }
// add a .note.GNU-stack section to mark the stack as non-executable // add a .note.GNU-stack section to mark the stack as non-executable
...@@ -2597,8 +2597,8 @@ elfobj: ...@@ -2597,8 +2597,8 @@ elfobj:
sh.type_ = SHT_SYMTAB sh.type_ = SHT_SYMTAB
sh.off = uint64(symo) sh.off = uint64(symo)
sh.size = uint64(Symsize) sh.size = uint64(Symsize)
sh.addralign = uint64(SysArch.RegSize) sh.addralign = uint64(ctxt.Arch.RegSize)
sh.entsize = 8 + 2*uint64(SysArch.RegSize) sh.entsize = 8 + 2*uint64(ctxt.Arch.RegSize)
sh.link = uint32(elfshname(".strtab").shnum) sh.link = uint32(elfshname(".strtab").shnum)
sh.info = uint32(elfglobalsymndx) sh.info = uint32(elfglobalsymndx)
...@@ -2723,7 +2723,7 @@ func elfadddynsym(ctxt *Link, s *Symbol) { ...@@ -2723,7 +2723,7 @@ func elfadddynsym(ctxt *Link, s *Symbol) {
/* size of object */ /* size of object */
Adduint64(ctxt, d, uint64(s.Size)) Adduint64(ctxt, d, uint64(s.Size))
if SysArch.Family == sys.AMD64 && !s.Attr.CgoExportDynamic() && s.Dynimplib != "" && !seenlib[s.Dynimplib] { if ctxt.Arch.Family == sys.AMD64 && !s.Attr.CgoExportDynamic() && s.Dynimplib != "" && !seenlib[s.Dynimplib] {
Elfwritedynent(ctxt, ctxt.Syms.Lookup(".dynamic", 0), DT_NEEDED, uint64(Addstring(ctxt.Syms.Lookup(".dynstr", 0), s.Dynimplib))) Elfwritedynent(ctxt, ctxt.Syms.Lookup(".dynamic", 0), DT_NEEDED, uint64(Addstring(ctxt.Syms.Lookup(".dynstr", 0), s.Dynimplib)))
} }
} else { } else {
...@@ -2751,9 +2751,9 @@ func elfadddynsym(ctxt *Link, s *Symbol) { ...@@ -2751,9 +2751,9 @@ func elfadddynsym(ctxt *Link, s *Symbol) {
t := STB_GLOBAL << 4 t := STB_GLOBAL << 4
// TODO(mwhudson): presumably the behavior should actually be the same on both arm and 386. // TODO(mwhudson): presumably the behavior should actually be the same on both arm and 386.
if SysArch.Family == sys.I386 && s.Attr.CgoExport() && s.Type&SMASK == STEXT { if ctxt.Arch.Family == sys.I386 && s.Attr.CgoExport() && s.Type&SMASK == STEXT {
t |= STT_FUNC t |= STT_FUNC
} else if SysArch.Family == sys.ARM && s.Attr.CgoExportDynamic() && s.Type&SMASK == STEXT { } else if ctxt.Arch.Family == sys.ARM && s.Attr.CgoExportDynamic() && s.Type&SMASK == STEXT {
t |= STT_FUNC t |= STT_FUNC
} else { } else {
t |= STT_OBJECT t |= STT_OBJECT
......
src/cmd/link/internal/ld/ldelf.go
View file @ 5d95de20
...@@ -528,9 +528,9 @@ func ldelf(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -528,9 +528,9 @@ func ldelf(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
return return
} }
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Errorf(nil, "%s: elf %s unimplemented", pn, SysArch.Name) Errorf(nil, "%s: elf %s unimplemented", pn, ctxt.Arch.Name)
return return
case sys.MIPS: case sys.MIPS:
...@@ -1051,7 +1051,7 @@ func readelfsym(ctxt *Link, elfobj *ElfObj, i int, sym *ElfSym, needSym int, loc ...@@ -1051,7 +1051,7 @@ func readelfsym(ctxt *Link, elfobj *ElfObj, i int, sym *ElfSym, needSym int, loc
} }
case ElfSymBindLocal: case ElfSymBindLocal:
if SysArch.Family == sys.ARM && (strings.HasPrefix(sym.name, "$a") || strings.HasPrefix(sym.name, "$d")) { if ctxt.Arch.Family == sys.ARM && (strings.HasPrefix(sym.name, "$a") || strings.HasPrefix(sym.name, "$d")) {
// binutils for arm generate these mapping // binutils for arm generate these mapping
// symbols, ignore these // symbols, ignore these
break break
...@@ -1134,7 +1134,7 @@ func relSize(ctxt *Link, pn string, elftype uint32) uint8 { ...@@ -1134,7 +1134,7 @@ func relSize(ctxt *Link, pn string, elftype uint32) uint8 {
S390X = uint32(sys.S390X) S390X = uint32(sys.S390X)
) )
switch uint32(SysArch.Family) | elftype<<24 { switch uint32(ctxt.Arch.Family) | elftype<<24 {
default: default:
Errorf(nil, "%s: unknown relocation type %d; compiled without -fpic?", pn, elftype) Errorf(nil, "%s: unknown relocation type %d; compiled without -fpic?", pn, elftype)
fallthrough fallthrough
......
src/cmd/link/internal/ld/ldmacho.go
View file @ 5d95de20
...@@ -480,9 +480,9 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -480,9 +480,9 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
m.length = length m.length = length
m.name = pn m.name = pn
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Errorf(nil, "%s: mach-o %s unimplemented", pn, SysArch.Name) Errorf(nil, "%s: mach-o %s unimplemented", pn, ctxt.Arch.Name)
return return
case sys.AMD64: case sys.AMD64:
...@@ -731,7 +731,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -731,7 +731,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
rp = &r[rpi] rp = &r[rpi]
rel = &sect.rel[j] rel = &sect.rel[j]
if rel.scattered != 0 { if rel.scattered != 0 {
if SysArch.Family != sys.I386 { if ctxt.Arch.Family != sys.I386 {
// mach-o only uses scattered relocation on 32-bit platforms // mach-o only uses scattered relocation on 32-bit platforms
Errorf(s, "unexpected scattered relocation") Errorf(s, "unexpected scattered relocation")
continue continue
...@@ -827,7 +827,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -827,7 +827,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
rp.Off = int32(rel.addr) rp.Off = int32(rel.addr)
// Handle X86_64_RELOC_SIGNED referencing a section (rel->extrn == 0). // Handle X86_64_RELOC_SIGNED referencing a section (rel->extrn == 0).
if SysArch.Family == sys.AMD64 && rel.extrn == 0 && rel.type_ == MACHO_X86_64_RELOC_SIGNED { if ctxt.Arch.Family == sys.AMD64 && rel.extrn == 0 && rel.type_ == MACHO_X86_64_RELOC_SIGNED {
// Calculate the addend as the offset into the section. // Calculate the addend as the offset into the section.
// //
// The rip-relative offset stored in the object file is encoded // The rip-relative offset stored in the object file is encoded
...@@ -852,7 +852,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -852,7 +852,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
// An unsigned internal relocation has a value offset // An unsigned internal relocation has a value offset
// by the section address. // by the section address.
if SysArch.Family == sys.AMD64 && rel.extrn == 0 && rel.type_ == MACHO_X86_64_RELOC_UNSIGNED { if ctxt.Arch.Family == sys.AMD64 && rel.extrn == 0 && rel.type_ == MACHO_X86_64_RELOC_UNSIGNED {
secaddr = c.seg.sect[rel.symnum-1].addr secaddr = c.seg.sect[rel.symnum-1].addr
rp.Add -= int64(secaddr) rp.Add -= int64(secaddr)
} }
...@@ -860,7 +860,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -860,7 +860,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
// For i386 Mach-O PC-relative, the addend is written such that // For i386 Mach-O PC-relative, the addend is written such that
// it *is* the PC being subtracted. Use that to make // it *is* the PC being subtracted. Use that to make
// it match our version of PC-relative. // it match our version of PC-relative.
if rel.pcrel != 0 && SysArch.Family == sys.I386 { if rel.pcrel != 0 && ctxt.Arch.Family == sys.I386 {
rp.Add += int64(rp.Off) + int64(rp.Siz) rp.Add += int64(rp.Off) + int64(rp.Siz)
} }
if rel.extrn == 0 { if rel.extrn == 0 {
...@@ -879,7 +879,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) { ...@@ -879,7 +879,7 @@ func ldmacho(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {
// include that information in the addend. // include that information in the addend.
// We only care about the delta from the // We only care about the delta from the
// section base. // section base.
if SysArch.Family == sys.I386 { if ctxt.Arch.Family == sys.I386 {
rp.Add -= int64(c.seg.sect[rel.symnum-1].addr) rp.Add -= int64(c.seg.sect[rel.symnum-1].addr)
} }
} else { } else {
......
src/cmd/link/internal/ld/ldpe.go
View file @ 5d95de20
...@@ -404,7 +404,7 @@ func readpesym(ctxt *Link, f *pe.File, sym *pe.COFFSymbol, sectsyms map[*pe.Sect ...@@ -404,7 +404,7 @@ func readpesym(ctxt *Link, f *pe.File, sym *pe.COFFSymbol, sectsyms map[*pe.Sect
if strings.HasPrefix(name, "__imp_") { if strings.HasPrefix(name, "__imp_") {
name = name[6:] // __imp_Name => Name name = name[6:] // __imp_Name => Name
} }
if SysArch.Family == sys.I386 && name[0] == '_' { if ctxt.Arch.Family == sys.I386 && name[0] == '_' {
name = name[1:] // _Name => Name name = name[1:] // _Name => Name
} }
} }
......
src/cmd/link/internal/ld/lib.go
View file @ 5d95de20
...@@ -105,8 +105,8 @@ type Arch struct { ...@@ -105,8 +105,8 @@ type Arch struct {
Elfreloc1 func(*Link, *Reloc, int64) bool Elfreloc1 func(*Link, *Reloc, int64) bool
Elfsetupplt func(*Link) Elfsetupplt func(*Link)
Gentext func(*Link) Gentext func(*Link)
Machoreloc1 func(*Symbol, *Reloc, int64) bool Machoreloc1 func(*sys.Arch, *Symbol, *Reloc, int64) bool
PEreloc1 func(*Symbol, *Reloc, int64) bool PEreloc1 func(*sys.Arch, *Symbol, *Reloc, int64) bool
Wput func(uint16) Wput func(uint16)
Lput func(uint32) Lput func(uint32)
Vput func(uint64) Vput func(uint64)
...@@ -188,7 +188,6 @@ func UseRelro() bool { ...@@ -188,7 +188,6 @@ func UseRelro() bool {
} }
var ( var (
SysArch *sys.Arch
dynexp []*Symbol dynexp []*Symbol
dynlib []string dynlib []string
ldflag []string ldflag []string
...@@ -379,7 +378,7 @@ func (ctxt *Link) findLibPathCmd(cmd, libname string) string { ...@@ -379,7 +378,7 @@ func (ctxt *Link) findLibPathCmd(cmd, libname string) string {
if *flagExtld == "" { if *flagExtld == "" {
*flagExtld = "gcc" *flagExtld = "gcc"
} }
args := hostlinkArchArgs() args := hostlinkArchArgs(ctxt.Arch)
args = append(args, cmd) args = append(args, cmd)
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%s %v\n", *flagExtld, args) ctxt.Logf("%s %v\n", *flagExtld, args)
...@@ -413,7 +412,7 @@ func (ctxt *Link) loadlib() { ...@@ -413,7 +412,7 @@ func (ctxt *Link) loadlib() {
} }
loadinternal(ctxt, "runtime") loadinternal(ctxt, "runtime")
if SysArch.Family == sys.ARM { if ctxt.Arch.Family == sys.ARM {
loadinternal(ctxt, "math") loadinternal(ctxt, "math")
} }
if *flagRace { if *flagRace {
...@@ -457,7 +456,7 @@ func (ctxt *Link) loadlib() { ...@@ -457,7 +456,7 @@ func (ctxt *Link) loadlib() {
*FlagTextAddr = 0 *FlagTextAddr = 0
} }
if Linkmode == LinkExternal && SysArch.Family == sys.PPC64 { if Linkmode == LinkExternal && ctxt.Arch.Family == sys.PPC64 {
toc := ctxt.Syms.Lookup(".TOC.", 0) toc := ctxt.Syms.Lookup(".TOC.", 0)
toc.Type = SDYNIMPORT toc.Type = SDYNIMPORT
} }
...@@ -503,7 +502,7 @@ func (ctxt *Link) loadlib() { ...@@ -503,7 +502,7 @@ func (ctxt *Link) loadlib() {
// a variable to hold g in assembly (currently only intel). // a variable to hold g in assembly (currently only intel).
if tlsg.Type == 0 { if tlsg.Type == 0 {
tlsg.Type = STLSBSS tlsg.Type = STLSBSS
tlsg.Size = int64(SysArch.PtrSize) tlsg.Size = int64(ctxt.Arch.PtrSize)
} else if tlsg.Type != SDYNIMPORT { } else if tlsg.Type != SDYNIMPORT {
Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type) Errorf(nil, "runtime declared tlsg variable %v", tlsg.Type)
} }
...@@ -527,7 +526,7 @@ func (ctxt *Link) loadlib() { ...@@ -527,7 +526,7 @@ func (ctxt *Link) loadlib() {
// In addition, on ARM, the runtime depends on the linker // In addition, on ARM, the runtime depends on the linker
// recording the value of GOARM. // recording the value of GOARM.
if SysArch.Family == sys.ARM { if ctxt.Arch.Family == sys.ARM {
s := ctxt.Syms.Lookup("runtime.goarm", 0) s := ctxt.Syms.Lookup("runtime.goarm", 0)
s.Type = SRODATA s.Type = SRODATA
s.Size = 0 s.Size = 0
...@@ -639,7 +638,7 @@ func (ctxt *Link) loadlib() { ...@@ -639,7 +638,7 @@ func (ctxt *Link) loadlib() {
} }
} }
if SysArch == sys.Arch386 { if ctxt.Arch == sys.Arch386 {
if (Buildmode == BuildmodeCArchive && Iself) || Buildmode == BuildmodeCShared || Buildmode == BuildmodePIE || ctxt.DynlinkingGo() { if (Buildmode == BuildmodeCArchive && Iself) || Buildmode == BuildmodeCShared || Buildmode == BuildmodePIE || ctxt.DynlinkingGo() {
got := ctxt.Syms.Lookup("_GLOBAL_OFFSET_TABLE_", 0) got := ctxt.Syms.Lookup("_GLOBAL_OFFSET_TABLE_", 0)
got.Type = SDYNIMPORT got.Type = SDYNIMPORT
...@@ -1082,7 +1081,7 @@ func (l *Link) hostlink() { ...@@ -1082,7 +1081,7 @@ func (l *Link) hostlink() {
var argv []string var argv []string
argv = append(argv, *flagExtld) argv = append(argv, *flagExtld)
argv = append(argv, hostlinkArchArgs()...) argv = append(argv, hostlinkArchArgs(l.Arch)...)
if !*FlagS && !debug_s { if !*FlagS && !debug_s {
argv = append(argv, "-gdwarf-2") argv = append(argv, "-gdwarf-2")
...@@ -1100,7 +1099,7 @@ func (l *Link) hostlink() { ...@@ -1100,7 +1099,7 @@ func (l *Link) hostlink() {
if l.DynlinkingGo() { if l.DynlinkingGo() {
argv = append(argv, "-Wl,-flat_namespace") argv = append(argv, "-Wl,-flat_namespace")
} }
if Buildmode == BuildmodeExe && !SysArch.InFamily(sys.ARM64) { if Buildmode == BuildmodeExe && !l.Arch.InFamily(sys.ARM64) {
argv = append(argv, "-Wl,-no_pie") argv = append(argv, "-Wl,-no_pie")
} }
case objabi.Hopenbsd: case objabi.Hopenbsd:
...@@ -1129,7 +1128,7 @@ func (l *Link) hostlink() { ...@@ -1129,7 +1128,7 @@ func (l *Link) hostlink() {
case BuildmodeCShared: case BuildmodeCShared:
if Headtype == objabi.Hdarwin { if Headtype == objabi.Hdarwin {
argv = append(argv, "-dynamiclib") argv = append(argv, "-dynamiclib")
if SysArch.Family != sys.AMD64 { if l.Arch.Family != sys.AMD64 {
argv = append(argv, "-Wl,-read_only_relocs,suppress") argv = append(argv, "-Wl,-read_only_relocs,suppress")
} }
} else { } else {
...@@ -1169,7 +1168,7 @@ func (l *Link) hostlink() { ...@@ -1169,7 +1168,7 @@ func (l *Link) hostlink() {
// from the beginning of the section (like STYPE). // from the beginning of the section (like STYPE).
argv = append(argv, "-Wl,-znocopyreloc") argv = append(argv, "-Wl,-znocopyreloc")
if SysArch.InFamily(sys.ARM, sys.ARM64) { if l.Arch.InFamily(sys.ARM, sys.ARM64) {
// On ARM, the GNU linker will generate COPY relocations // On ARM, the GNU linker will generate COPY relocations
// even with -znocopyreloc set. // even with -znocopyreloc set.
// https://sourceware.org/bugzilla/show_bug.cgi?id=19962 // https://sourceware.org/bugzilla/show_bug.cgi?id=19962
...@@ -1335,7 +1334,7 @@ func (l *Link) hostlink() { ...@@ -1335,7 +1334,7 @@ func (l *Link) hostlink() {
if !*FlagS && !*FlagW && !debug_s && Headtype == objabi.Hdarwin { if !*FlagS && !*FlagW && !debug_s && Headtype == objabi.Hdarwin {
// Skip combining dwarf on arm. // Skip combining dwarf on arm.
if !SysArch.InFamily(sys.ARM, sys.ARM64) { if !l.Arch.InFamily(sys.ARM, sys.ARM64) {
dsym := filepath.Join(*flagTmpdir, "go.dwarf") dsym := filepath.Join(*flagTmpdir, "go.dwarf")
if out, err := exec.Command("dsymutil", "-f", *flagOutfile, "-o", dsym).CombinedOutput(); err != nil { if out, err := exec.Command("dsymutil", "-f", *flagOutfile, "-o", dsym).CombinedOutput(); err != nil {
Exitf("%s: running dsymutil failed: %v\n%s", os.Args[0], err, out) Exitf("%s: running dsymutil failed: %v\n%s", os.Args[0], err, out)
...@@ -1359,8 +1358,8 @@ func (l *Link) hostlink() { ...@@ -1359,8 +1358,8 @@ func (l *Link) hostlink() {
// hostlinkArchArgs returns arguments to pass to the external linker // hostlinkArchArgs returns arguments to pass to the external linker
// based on the architecture. // based on the architecture.
func hostlinkArchArgs() []string { func hostlinkArchArgs(arch *sys.Arch) []string {
switch SysArch.Family { switch arch.Family {
case sys.I386: case sys.I386:
return []string{"-m32"} return []string{"-m32"}
case sys.AMD64, sys.PPC64, sys.S390X: case sys.AMD64, sys.PPC64, sys.S390X:
...@@ -1417,7 +1416,7 @@ func ldobj(ctxt *Link, f *bio.Reader, lib *Library, length int64, pn string, fil ...@@ -1417,7 +1416,7 @@ func ldobj(ctxt *Link, f *bio.Reader, lib *Library, length int64, pn string, fil
return nil return nil
} }
if line == SysArch.Name { if line == ctxt.Arch.Name {
// old header format: just $GOOS // old header format: just $GOOS
Errorf(nil, "%s: stale object file", pn) Errorf(nil, "%s: stale object file", pn)
return nil return nil
...@@ -1633,12 +1632,12 @@ func ldshlibsyms(ctxt *Link, shlib string) { ...@@ -1633,12 +1632,12 @@ func ldshlibsyms(ctxt *Link, shlib string) {
// the type data. // the type data.
if strings.HasPrefix(lsym.Name, "type.") && !strings.HasPrefix(lsym.Name, "type..") { if strings.HasPrefix(lsym.Name, "type.") && !strings.HasPrefix(lsym.Name, "type..") {
lsym.P = readelfsymboldata(ctxt, f, &elfsym) lsym.P = readelfsymboldata(ctxt, f, &elfsym)
gcdataLocations[elfsym.Value+2*uint64(SysArch.PtrSize)+8+1*uint64(SysArch.PtrSize)] = lsym gcdataLocations[elfsym.Value+2*uint64(ctxt.Arch.PtrSize)+8+1*uint64(ctxt.Arch.PtrSize)] = lsym
} }
} }
} }
gcdataAddresses := make(map[*Symbol]uint64) gcdataAddresses := make(map[*Symbol]uint64)
if SysArch.Family == sys.ARM64 { if ctxt.Arch.Family == sys.ARM64 {
for _, sect := range f.Sections { for _, sect := range f.Sections {
if sect.Type == elf.SHT_RELA { if sect.Type == elf.SHT_RELA {
var rela elf.Rela64 var rela elf.Rela64
...@@ -1666,12 +1665,12 @@ func ldshlibsyms(ctxt *Link, shlib string) { ...@@ -1666,12 +1665,12 @@ func ldshlibsyms(ctxt *Link, shlib string) {
ctxt.Shlibs = append(ctxt.Shlibs, Shlib{Path: libpath, Hash: hash, Deps: deps, File: f, gcdataAddresses: gcdataAddresses}) ctxt.Shlibs = append(ctxt.Shlibs, Shlib{Path: libpath, Hash: hash, Deps: deps, File: f, gcdataAddresses: gcdataAddresses})
} }
func addsection(seg *Segment, name string, rwx int) *Section { func addsection(arch *sys.Arch, seg *Segment, name string, rwx int) *Section {
sect := new(Section) sect := new(Section)
sect.Rwx = uint8(rwx) sect.Rwx = uint8(rwx)
sect.Name = name sect.Name = name
sect.Seg = seg sect.Seg = seg
sect.Align = int32(SysArch.PtrSize) // everything is at least pointer-aligned sect.Align = int32(arch.PtrSize) // everything is at least pointer-aligned
seg.Sections = append(seg.Sections, sect) seg.Sections = append(seg.Sections, sect)
return sect return sect
} }
...@@ -1715,7 +1714,7 @@ func callsize(ctxt *Link) int { ...@@ -1715,7 +1714,7 @@ func callsize(ctxt *Link) int {
if haslinkregister(ctxt) { if haslinkregister(ctxt) {
return 0 return 0
} }
return SysArch.RegSize return ctxt.Arch.RegSize
} }
func (ctxt *Link) dostkcheck() { func (ctxt *Link) dostkcheck() {
...@@ -2077,7 +2076,7 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, * ...@@ -2077,7 +2076,7 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, *
locals = s.FuncInfo.Locals locals = s.FuncInfo.Locals
} }
// NOTE(ality): acid can't produce a stack trace without .frame symbols // NOTE(ality): acid can't produce a stack trace without .frame symbols
put(ctxt, nil, ".frame", FrameSym, int64(locals)+int64(SysArch.PtrSize), nil) put(ctxt, nil, ".frame", FrameSym, int64(locals)+int64(ctxt.Arch.PtrSize), nil)
if s.FuncInfo == nil { if s.FuncInfo == nil {
continue continue
...@@ -2093,7 +2092,7 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, * ...@@ -2093,7 +2092,7 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, *
if a.Name == objabi.A_PARAM { if a.Name == objabi.A_PARAM {
off = a.Aoffset off = a.Aoffset
} else { } else {
off = a.Aoffset - int32(SysArch.PtrSize) off = a.Aoffset - int32(ctxt.Arch.PtrSize)
} }
// FP // FP
...@@ -2103,8 +2102,8 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, * ...@@ -2103,8 +2102,8 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, *
} }
// SP // SP
if off <= int32(-SysArch.PtrSize) { if off <= int32(-ctxt.Arch.PtrSize) {
put(ctxt, nil, a.Asym.Name, AutoSym, -(int64(off) + int64(SysArch.PtrSize)), a.Gotype) put(ctxt, nil, a.Asym.Name, AutoSym, -(int64(off) + int64(ctxt.Arch.PtrSize)), a.Gotype)
continue continue
} }
// Otherwise, off is addressing the saved program counter. // Otherwise, off is addressing the saved program counter.
......
src/cmd/link/internal/ld/link.go
View file @ 5d95de20
...@@ -331,14 +331,14 @@ const ( ...@@ -331,14 +331,14 @@ const (
RV_TYPE_MASK RelocVariant = RV_CHECK_OVERFLOW - 1 RV_TYPE_MASK RelocVariant = RV_CHECK_OVERFLOW - 1
) )
func RelocName(r objabi.RelocType) string { func RelocName(arch *sys.Arch, r objabi.RelocType) string {
// We didn't have some relocation types at Go1.4. // We didn't have some relocation types at Go1.4.
// Uncomment code when we include those in bootstrap code. // Uncomment code when we include those in bootstrap code.
switch { switch {
case r >= 512: // Mach-O case r >= 512: // Mach-O
// nr := (r - 512)>>1 // nr := (r - 512)>>1
// switch SysArch.Family { // switch ctxt.Arch.Family {
// case sys.AMD64: // case sys.AMD64:
// return macho.RelocTypeX86_64(nr).String() // return macho.RelocTypeX86_64(nr).String()
// case sys.ARM: // case sys.ARM:
...@@ -352,7 +352,7 @@ func RelocName(r objabi.RelocType) string { ...@@ -352,7 +352,7 @@ func RelocName(r objabi.RelocType) string {
// } // }
case r >= 256: // ELF case r >= 256: // ELF
nr := r - 256 nr := r - 256
switch SysArch.Family { switch arch.Family {
case sys.AMD64: case sys.AMD64:
return elf.R_X86_64(nr).String() return elf.R_X86_64(nr).String()
case sys.ARM: case sys.ARM:
......
src/cmd/link/internal/ld/macho.go
View file @ 5d95de20
...@@ -148,8 +148,6 @@ const ( ...@@ -148,8 +148,6 @@ const (
// Mach-O file writing // Mach-O file writing
// http://developer.apple.com/mac/library/DOCUMENTATION/DeveloperTools/Conceptual/MachORuntime/Reference/reference.html // http://developer.apple.com/mac/library/DOCUMENTATION/DeveloperTools/Conceptual/MachORuntime/Reference/reference.html
var macho64 bool
var machohdr MachoHdr var machohdr MachoHdr
var load []MachoLoad var load []MachoLoad
...@@ -183,16 +181,12 @@ var nsortsym int ...@@ -183,16 +181,12 @@ var nsortsym int
// up about 1300 bytes; we overestimate that as 2k. // up about 1300 bytes; we overestimate that as 2k.
var loadBudget int = INITIAL_MACHO_HEADR - 2*1024 var loadBudget int = INITIAL_MACHO_HEADR - 2*1024
func Machoinit() {
macho64 = SysArch.RegSize == 8
}
func getMachoHdr() *MachoHdr { func getMachoHdr() *MachoHdr {
return &machohdr return &machohdr
} }
func newMachoLoad(type_ uint32, ndata uint32) *MachoLoad { func newMachoLoad(arch *sys.Arch, type_ uint32, ndata uint32) *MachoLoad {
if macho64 && (ndata&1 != 0) { if arch.PtrSize == 8 && (ndata&1 != 0) {
ndata++ ndata++
} }
...@@ -235,14 +229,14 @@ var dylib []string ...@@ -235,14 +229,14 @@ var dylib []string
var linkoff int64 var linkoff int64
func machowrite() int { func machowrite(arch *sys.Arch) int {
o1 := coutbuf.Offset() o1 := coutbuf.Offset()
loadsize := 4 * 4 * ndebug loadsize := 4 * 4 * ndebug
for i := 0; i < len(load); i++ { for i := 0; i < len(load); i++ {
loadsize += 4 * (len(load[i].data) + 2) loadsize += 4 * (len(load[i].data) + 2)
} }
if macho64 { if arch.PtrSize == 8 {
loadsize += 18 * 4 * nseg loadsize += 18 * 4 * nseg
loadsize += 20 * 4 * nsect loadsize += 20 * 4 * nsect
} else { } else {
...@@ -250,7 +244,7 @@ func machowrite() int { ...@@ -250,7 +244,7 @@ func machowrite() int {
loadsize += 17 * 4 * nsect loadsize += 17 * 4 * nsect
} }
if macho64 { if arch.PtrSize == 8 {
Thearch.Lput(MH_MAGIC_64) Thearch.Lput(MH_MAGIC_64)
} else { } else {
Thearch.Lput(MH_MAGIC) Thearch.Lput(MH_MAGIC)
...@@ -269,13 +263,13 @@ func machowrite() int { ...@@ -269,13 +263,13 @@ func machowrite() int {
} else { } else {
Thearch.Lput(0) /* flags */ Thearch.Lput(0) /* flags */
} }
if macho64 { if arch.PtrSize == 8 {
Thearch.Lput(0) /* reserved */ Thearch.Lput(0) /* reserved */
} }
for i := 0; i < nseg; i++ { for i := 0; i < nseg; i++ {
s := &seg[i] s := &seg[i]
if macho64 { if arch.PtrSize == 8 {
Thearch.Lput(LC_SEGMENT_64) Thearch.Lput(LC_SEGMENT_64)
Thearch.Lput(72 + 80*s.nsect) Thearch.Lput(72 + 80*s.nsect)
strnput(s.name, 16) strnput(s.name, 16)
...@@ -303,7 +297,7 @@ func machowrite() int { ...@@ -303,7 +297,7 @@ func machowrite() int {
for j := uint32(0); j < s.nsect; j++ { for j := uint32(0); j < s.nsect; j++ {
t := &s.sect[j] t := &s.sect[j]
if macho64 { if arch.PtrSize == 8 {
strnput(t.name, 16) strnput(t.name, 16)
strnput(t.segname, 16) strnput(t.segname, 16)
Thearch.Vput(t.addr) Thearch.Vput(t.addr)
...@@ -406,9 +400,9 @@ func machoshbits(ctxt *Link, mseg *MachoSeg, sect *Section, segname string) { ...@@ -406,9 +400,9 @@ func machoshbits(ctxt *Link, mseg *MachoSeg, sect *Section, segname string) {
buf := "__" + strings.Replace(sect.Name[1:], ".", "_", -1) buf := "__" + strings.Replace(sect.Name[1:], ".", "_", -1)
var msect *MachoSect var msect *MachoSect
if sect.Rwx&1 == 0 && segname != "__DWARF" && (SysArch.Family == sys.ARM64 || if sect.Rwx&1 == 0 && segname != "__DWARF" && (ctxt.Arch.Family == sys.ARM64 ||
(SysArch.Family == sys.AMD64 && Buildmode != BuildmodeExe) || (ctxt.Arch.Family == sys.AMD64 && Buildmode != BuildmodeExe) ||
(SysArch.Family == sys.ARM && Buildmode != BuildmodeExe)) { (ctxt.Arch.Family == sys.ARM && Buildmode != BuildmodeExe)) {
// Darwin external linker on arm64 and on amd64 and arm in c-shared/c-archive buildmode // Darwin external linker on arm64 and on amd64 and arm in c-shared/c-archive buildmode
// complains about absolute relocs in __TEXT, so if the section is not // complains about absolute relocs in __TEXT, so if the section is not
// executable, put it in __DATA segment. // executable, put it in __DATA segment.
...@@ -471,9 +465,9 @@ func Asmbmacho(ctxt *Link) { ...@@ -471,9 +465,9 @@ func Asmbmacho(ctxt *Link) {
va := *FlagTextAddr - int64(HEADR) va := *FlagTextAddr - int64(HEADR)
mh := getMachoHdr() mh := getMachoHdr()
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Exitf("unknown macho architecture: %v", SysArch.Family) Exitf("unknown macho architecture: %v", ctxt.Arch.Family)
case sys.ARM: case sys.ARM:
mh.cpu = MACHO_CPU_ARM mh.cpu = MACHO_CPU_ARM
...@@ -498,7 +492,7 @@ func Asmbmacho(ctxt *Link) { ...@@ -498,7 +492,7 @@ func Asmbmacho(ctxt *Link) {
ms = newMachoSeg("", 40) ms = newMachoSeg("", 40)
ms.fileoffset = Segtext.Fileoff ms.fileoffset = Segtext.Fileoff
if SysArch.Family == sys.ARM || Buildmode == BuildmodeCArchive { if ctxt.Arch.Family == sys.ARM || Buildmode == BuildmodeCArchive {
ms.filesize = Segdata.Fileoff + Segdata.Filelen - Segtext.Fileoff ms.filesize = Segdata.Fileoff + Segdata.Filelen - Segtext.Fileoff
} else { } else {
ms.filesize = Segdwarf.Fileoff + Segdwarf.Filelen - Segtext.Fileoff ms.filesize = Segdwarf.Fileoff + Segdwarf.Filelen - Segtext.Fileoff
...@@ -560,32 +554,32 @@ func Asmbmacho(ctxt *Link) { ...@@ -560,32 +554,32 @@ func Asmbmacho(ctxt *Link) {
} }
if Linkmode != LinkExternal { if Linkmode != LinkExternal {
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Exitf("unknown macho architecture: %v", SysArch.Family) Exitf("unknown macho architecture: %v", ctxt.Arch.Family)
case sys.ARM: case sys.ARM:
ml := newMachoLoad(LC_UNIXTHREAD, 17+2) ml := newMachoLoad(ctxt.Arch, LC_UNIXTHREAD, 17+2)
ml.data[0] = 1 /* thread type */ ml.data[0] = 1 /* thread type */
ml.data[1] = 17 /* word count */ ml.data[1] = 17 /* word count */
ml.data[2+15] = uint32(Entryvalue(ctxt)) /* start pc */ ml.data[2+15] = uint32(Entryvalue(ctxt)) /* start pc */
case sys.AMD64: case sys.AMD64:
ml := newMachoLoad(LC_UNIXTHREAD, 42+2) ml := newMachoLoad(ctxt.Arch, LC_UNIXTHREAD, 42+2)
ml.data[0] = 4 /* thread type */ ml.data[0] = 4 /* thread type */
ml.data[1] = 42 /* word count */ ml.data[1] = 42 /* word count */
ml.data[2+32] = uint32(Entryvalue(ctxt)) /* start pc */ ml.data[2+32] = uint32(Entryvalue(ctxt)) /* start pc */
ml.data[2+32+1] = uint32(Entryvalue(ctxt) >> 32) ml.data[2+32+1] = uint32(Entryvalue(ctxt) >> 32)
case sys.ARM64: case sys.ARM64:
ml := newMachoLoad(LC_UNIXTHREAD, 68+2) ml := newMachoLoad(ctxt.Arch, LC_UNIXTHREAD, 68+2)
ml.data[0] = 6 /* thread type */ ml.data[0] = 6 /* thread type */
ml.data[1] = 68 /* word count */ ml.data[1] = 68 /* word count */
ml.data[2+64] = uint32(Entryvalue(ctxt)) /* start pc */ ml.data[2+64] = uint32(Entryvalue(ctxt)) /* start pc */
ml.data[2+64+1] = uint32(Entryvalue(ctxt) >> 32) ml.data[2+64+1] = uint32(Entryvalue(ctxt) >> 32)
case sys.I386: case sys.I386:
ml := newMachoLoad(LC_UNIXTHREAD, 16+2) ml := newMachoLoad(ctxt.Arch, LC_UNIXTHREAD, 16+2)
ml.data[0] = 1 /* thread type */ ml.data[0] = 1 /* thread type */
ml.data[1] = 16 /* word count */ ml.data[1] = 16 /* word count */
ml.data[2+10] = uint32(Entryvalue(ctxt)) /* start pc */ ml.data[2+10] = uint32(Entryvalue(ctxt)) /* start pc */
...@@ -609,7 +603,7 @@ func Asmbmacho(ctxt *Link) { ...@@ -609,7 +603,7 @@ func Asmbmacho(ctxt *Link) {
ms.prot2 = 3 ms.prot2 = 3
} }
ml := newMachoLoad(LC_SYMTAB, 4) ml := newMachoLoad(ctxt.Arch, LC_SYMTAB, 4)
ml.data[0] = uint32(linkoff) /* symoff */ ml.data[0] = uint32(linkoff) /* symoff */
ml.data[1] = uint32(nsortsym) /* nsyms */ ml.data[1] = uint32(nsortsym) /* nsyms */
ml.data[2] = uint32(linkoff + s1.Size + s2.Size + s3.Size) /* stroff */ ml.data[2] = uint32(linkoff + s1.Size + s2.Size + s3.Size) /* stroff */
...@@ -618,12 +612,12 @@ func Asmbmacho(ctxt *Link) { ...@@ -618,12 +612,12 @@ func Asmbmacho(ctxt *Link) {
machodysymtab(ctxt) machodysymtab(ctxt)
if Linkmode != LinkExternal { if Linkmode != LinkExternal {
ml := newMachoLoad(LC_LOAD_DYLINKER, 6) ml := newMachoLoad(ctxt.Arch, LC_LOAD_DYLINKER, 6)
ml.data[0] = 12 /* offset to string */ ml.data[0] = 12 /* offset to string */
stringtouint32(ml.data[1:], "/usr/lib/dyld") stringtouint32(ml.data[1:], "/usr/lib/dyld")
for i := 0; i < len(dylib); i++ { for i := 0; i < len(dylib); i++ {
ml = newMachoLoad(LC_LOAD_DYLIB, 4+(uint32(len(dylib[i]))+1+7)/8*2) ml = newMachoLoad(ctxt.Arch, LC_LOAD_DYLIB, 4+(uint32(len(dylib[i]))+1+7)/8*2)
ml.data[0] = 24 /* offset of string from beginning of load */ ml.data[0] = 24 /* offset of string from beginning of load */
ml.data[1] = 0 /* time stamp */ ml.data[1] = 0 /* time stamp */
ml.data[2] = 0 /* version */ ml.data[2] = 0 /* version */
...@@ -642,12 +636,12 @@ func Asmbmacho(ctxt *Link) { ...@@ -642,12 +636,12 @@ func Asmbmacho(ctxt *Link) {
// and we can assume OS X. // and we can assume OS X.
// //
// See golang.org/issues/12941. // See golang.org/issues/12941.
ml := newMachoLoad(LC_VERSION_MIN_MACOSX, 2) ml := newMachoLoad(ctxt.Arch, LC_VERSION_MIN_MACOSX, 2)
ml.data[0] = 10<<16 | 7<<8 | 0<<0 // OS X version 10.7.0 ml.data[0] = 10<<16 | 7<<8 | 0<<0 // OS X version 10.7.0
ml.data[1] = 10<<16 | 7<<8 | 0<<0 // SDK 10.7.0 ml.data[1] = 10<<16 | 7<<8 | 0<<0 // SDK 10.7.0
} }
a := machowrite() a := machowrite(ctxt.Arch)
if int32(a) > HEADR { if int32(a) > HEADR {
Exitf("HEADR too small: %d > %d", a, HEADR) Exitf("HEADR too small: %d > %d", a, HEADR)
} }
...@@ -790,7 +784,7 @@ func machosymtab(ctxt *Link) { ...@@ -790,7 +784,7 @@ func machosymtab(ctxt *Link) {
Adduint8(ctxt, symtab, 0x01) // type N_EXT, external symbol Adduint8(ctxt, symtab, 0x01) // type N_EXT, external symbol
Adduint8(ctxt, symtab, 0) // no section Adduint8(ctxt, symtab, 0) // no section
Adduint16(ctxt, symtab, 0) // desc Adduint16(ctxt, symtab, 0) // desc
adduintxx(ctxt, symtab, 0, SysArch.PtrSize) // no value adduintxx(ctxt, symtab, 0, ctxt.Arch.PtrSize) // no value
} else { } else {
if s.Attr.CgoExport() || export { if s.Attr.CgoExport() || export {
Adduint8(ctxt, symtab, 0x0f) Adduint8(ctxt, symtab, 0x0f)
...@@ -808,13 +802,13 @@ func machosymtab(ctxt *Link) { ...@@ -808,13 +802,13 @@ func machosymtab(ctxt *Link) {
Adduint8(ctxt, symtab, uint8(o.Sect.Extnum)) Adduint8(ctxt, symtab, uint8(o.Sect.Extnum))
} }
Adduint16(ctxt, symtab, 0) // desc Adduint16(ctxt, symtab, 0) // desc
adduintxx(ctxt, symtab, uint64(Symaddr(s)), SysArch.PtrSize) adduintxx(ctxt, symtab, uint64(Symaddr(s)), ctxt.Arch.PtrSize)
} }
} }
} }
func machodysymtab(ctxt *Link) { func machodysymtab(ctxt *Link) {
ml := newMachoLoad(LC_DYSYMTAB, 18) ml := newMachoLoad(ctxt.Arch, LC_DYSYMTAB, 18)
n := 0 n := 0
ml.data[0] = uint32(n) /* ilocalsym */ ml.data[0] = uint32(n) /* ilocalsym */
...@@ -930,10 +924,10 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) { ...@@ -930,10 +924,10 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) {
continue continue
} }
if !r.Xsym.Attr.Reachable() { if !r.Xsym.Attr.Reachable() {
Errorf(sym, "unreachable reloc %d (%s) target %v", r.Type, RelocName(r.Type), r.Xsym.Name) Errorf(sym, "unreachable reloc %d (%s) target %v", r.Type, RelocName(ctxt.Arch, r.Type), r.Xsym.Name)
} }
if !Thearch.Machoreloc1(sym, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) { if !Thearch.Machoreloc1(ctxt.Arch, sym, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) {
Errorf(sym, "unsupported obj reloc %d (%s)/%d to %s", r.Type, RelocName(r.Type), r.Siz, r.Sym.Name) Errorf(sym, "unsupported obj reloc %d (%s)/%d to %s", r.Type, RelocName(ctxt.Arch, r.Type), r.Siz, r.Sym.Name)
} }
} }
} }
......
src/cmd/link/internal/ld/main.go
View file @ 5d95de20
...@@ -100,8 +100,9 @@ var ( ...@@ -100,8 +100,9 @@ var (
) )
// Main is the main entry point for the linker code. // Main is the main entry point for the linker code.
func Main() { func Main(arch *sys.Arch, theArch Arch) {
ctxt := linknew(SysArch) Thearch = theArch
ctxt := linknew(arch)
ctxt.Bso = bufio.NewWriter(os.Stdout) ctxt.Bso = bufio.NewWriter(os.Stdout)
// For testing behavior of go command when tools crash silently. // For testing behavior of go command when tools crash silently.
...@@ -114,7 +115,7 @@ func Main() { ...@@ -114,7 +115,7 @@ func Main() {
} }
// TODO(matloob): define these above and then check flag values here // TODO(matloob): define these above and then check flag values here
if SysArch.Family == sys.AMD64 && objabi.GOOS == "plan9" { if ctxt.Arch.Family == sys.AMD64 && objabi.GOOS == "plan9" {
flag.BoolVar(&Flag8, "8", false, "use 64-bit addresses in symbol table") flag.BoolVar(&Flag8, "8", false, "use 64-bit addresses in symbol table")
} }
objabi.Flagfn1("B", "add an ELF NT_GNU_BUILD_ID `note` when using ELF", addbuildinfo) objabi.Flagfn1("B", "add an ELF NT_GNU_BUILD_ID `note` when using ELF", addbuildinfo)
......
src/cmd/link/internal/ld/pcln.go
View file @ 5d95de20
...@@ -226,12 +226,12 @@ func (ctxt *Link) pclntab() { ...@@ -226,12 +226,12 @@ func (ctxt *Link) pclntab() {
} }
pclntabNfunc = nfunc pclntabNfunc = nfunc
Symgrow(ftab, 8+int64(SysArch.PtrSize)+int64(nfunc)*2*int64(SysArch.PtrSize)+int64(SysArch.PtrSize)+4) Symgrow(ftab, 8+int64(ctxt.Arch.PtrSize)+int64(nfunc)*2*int64(ctxt.Arch.PtrSize)+int64(ctxt.Arch.PtrSize)+4)
setuint32(ctxt, ftab, 0, 0xfffffffb) setuint32(ctxt, ftab, 0, 0xfffffffb)
setuint8(ctxt, ftab, 6, uint8(SysArch.MinLC)) setuint8(ctxt, ftab, 6, uint8(ctxt.Arch.MinLC))
setuint8(ctxt, ftab, 7, uint8(SysArch.PtrSize)) setuint8(ctxt, ftab, 7, uint8(ctxt.Arch.PtrSize))
setuint(ctxt, ftab, 8, uint64(nfunc)) setuint(ctxt, ftab, 8, uint64(nfunc))
pclntabPclntabOffset = int32(8 + SysArch.PtrSize) pclntabPclntabOffset = int32(8 + ctxt.Arch.PtrSize)
funcnameoff := make(map[string]int32) funcnameoff := make(map[string]int32)
nameToOffset := func(name string) int32 { nameToOffset := func(name string) int32 {
...@@ -279,10 +279,10 @@ func (ctxt *Link) pclntab() { ...@@ -279,10 +279,10 @@ func (ctxt *Link) pclntab() {
} }
funcstart := int32(len(ftab.P)) funcstart := int32(len(ftab.P))
funcstart += int32(-len(ftab.P)) & (int32(SysArch.PtrSize) - 1) funcstart += int32(-len(ftab.P)) & (int32(ctxt.Arch.PtrSize) - 1)
setaddr(ctxt, ftab, 8+int64(SysArch.PtrSize)+int64(nfunc)*2*int64(SysArch.PtrSize), s) setaddr(ctxt, ftab, 8+int64(ctxt.Arch.PtrSize)+int64(nfunc)*2*int64(ctxt.Arch.PtrSize), s)
setuint(ctxt, ftab, 8+int64(SysArch.PtrSize)+int64(nfunc)*2*int64(SysArch.PtrSize)+int64(SysArch.PtrSize), uint64(funcstart)) setuint(ctxt, ftab, 8+int64(ctxt.Arch.PtrSize)+int64(nfunc)*2*int64(ctxt.Arch.PtrSize)+int64(ctxt.Arch.PtrSize), uint64(funcstart))
// Write runtime._func. Keep in sync with ../../../../runtime/runtime2.go:/_func // Write runtime._func. Keep in sync with ../../../../runtime/runtime2.go:/_func
// and package debug/gosym. // and package debug/gosym.
...@@ -290,8 +290,8 @@ func (ctxt *Link) pclntab() { ...@@ -290,8 +290,8 @@ func (ctxt *Link) pclntab() {
// fixed size of struct, checked below // fixed size of struct, checked below
off := funcstart off := funcstart
end := funcstart + int32(SysArch.PtrSize) + 3*4 + 5*4 + int32(len(pcln.Pcdata))*4 + int32(len(pcln.Funcdata))*int32(SysArch.PtrSize) end := funcstart + int32(ctxt.Arch.PtrSize) + 3*4 + 5*4 + int32(len(pcln.Pcdata))*4 + int32(len(pcln.Funcdata))*int32(ctxt.Arch.PtrSize)
if len(pcln.Funcdata) > 0 && (end&int32(SysArch.PtrSize-1) != 0) { if len(pcln.Funcdata) > 0 && (end&int32(ctxt.Arch.PtrSize-1) != 0) {
end += 4 end += 4
} }
Symgrow(ftab, int64(end)) Symgrow(ftab, int64(end))
...@@ -370,25 +370,25 @@ func (ctxt *Link) pclntab() { ...@@ -370,25 +370,25 @@ func (ctxt *Link) pclntab() {
// funcdata, must be pointer-aligned and we're only int32-aligned. // funcdata, must be pointer-aligned and we're only int32-aligned.
// Missing funcdata will be 0 (nil pointer). // Missing funcdata will be 0 (nil pointer).
if len(pcln.Funcdata) > 0 { if len(pcln.Funcdata) > 0 {
if off&int32(SysArch.PtrSize-1) != 0 { if off&int32(ctxt.Arch.PtrSize-1) != 0 {
off += 4 off += 4
} }
for i := 0; i < len(pcln.Funcdata); i++ { for i := 0; i < len(pcln.Funcdata); i++ {
if pcln.Funcdata[i] == nil { if pcln.Funcdata[i] == nil {
setuint(ctxt, ftab, int64(off)+int64(SysArch.PtrSize)*int64(i), uint64(pcln.Funcdataoff[i])) setuint(ctxt, ftab, int64(off)+int64(ctxt.Arch.PtrSize)*int64(i), uint64(pcln.Funcdataoff[i]))
} else { } else {
// TODO: Dedup. // TODO: Dedup.
funcdataBytes += pcln.Funcdata[i].Size funcdataBytes += pcln.Funcdata[i].Size
setaddrplus(ctxt, ftab, int64(off)+int64(SysArch.PtrSize)*int64(i), pcln.Funcdata[i], pcln.Funcdataoff[i]) setaddrplus(ctxt, ftab, int64(off)+int64(ctxt.Arch.PtrSize)*int64(i), pcln.Funcdata[i], pcln.Funcdataoff[i])
} }
} }
off += int32(len(pcln.Funcdata)) * int32(SysArch.PtrSize) off += int32(len(pcln.Funcdata)) * int32(ctxt.Arch.PtrSize)
} }
if off != end { if off != end {
Errorf(s, "bad math in functab: funcstart=%d off=%d but end=%d (npcdata=%d nfuncdata=%d ptrsize=%d)", funcstart, off, end, len(pcln.Pcdata), len(pcln.Funcdata), SysArch.PtrSize) Errorf(s, "bad math in functab: funcstart=%d off=%d but end=%d (npcdata=%d nfuncdata=%d ptrsize=%d)", funcstart, off, end, len(pcln.Pcdata), len(pcln.Funcdata), ctxt.Arch.PtrSize)
errorexit() errorexit()
} }
...@@ -397,14 +397,14 @@ func (ctxt *Link) pclntab() { ...@@ -397,14 +397,14 @@ func (ctxt *Link) pclntab() {
pclntabLastFunc = last pclntabLastFunc = last
// Final entry of table is just end pc. // Final entry of table is just end pc.
setaddrplus(ctxt, ftab, 8+int64(SysArch.PtrSize)+int64(nfunc)*2*int64(SysArch.PtrSize), last, last.Size) setaddrplus(ctxt, ftab, 8+int64(ctxt.Arch.PtrSize)+int64(nfunc)*2*int64(ctxt.Arch.PtrSize), last, last.Size)
// Start file table. // Start file table.
start := int32(len(ftab.P)) start := int32(len(ftab.P))
start += int32(-len(ftab.P)) & (int32(SysArch.PtrSize) - 1) start += int32(-len(ftab.P)) & (int32(ctxt.Arch.PtrSize) - 1)
pclntabFiletabOffset = start pclntabFiletabOffset = start
setuint32(ctxt, ftab, 8+int64(SysArch.PtrSize)+int64(nfunc)*2*int64(SysArch.PtrSize)+int64(SysArch.PtrSize), uint32(start)) setuint32(ctxt, ftab, 8+int64(ctxt.Arch.PtrSize)+int64(nfunc)*2*int64(ctxt.Arch.PtrSize)+int64(ctxt.Arch.PtrSize), uint32(start))
Symgrow(ftab, int64(start)+(int64(len(ctxt.Filesyms))+1)*4) Symgrow(ftab, int64(start)+(int64(len(ctxt.Filesyms))+1)*4)
setuint32(ctxt, ftab, int64(start), uint32(len(ctxt.Filesyms)+1)) setuint32(ctxt, ftab, int64(start), uint32(len(ctxt.Filesyms)+1))
......
src/cmd/link/internal/ld/pe.go
View file @ 5d95de20
...@@ -517,7 +517,7 @@ func (f *peFile) emitRelocations(ctxt *Link) { ...@@ -517,7 +517,7 @@ func (f *peFile) emitRelocations(ctxt *Link) {
if r.Xsym.Dynid < 0 { if r.Xsym.Dynid < 0 {
Errorf(sym, "reloc %d to non-coff symbol %s (outer=%s) %d", r.Type, r.Sym.Name, r.Xsym.Name, r.Sym.Type) Errorf(sym, "reloc %d to non-coff symbol %s (outer=%s) %d", r.Type, r.Sym.Name, r.Xsym.Name, r.Sym.Type)
} }
if !Thearch.PEreloc1(sym, r, int64(uint64(sym.Value+int64(r.Off))-base)) { if !Thearch.PEreloc1(ctxt.Arch, sym, r, int64(uint64(sym.Value+int64(r.Off))-base)) {
Errorf(sym, "unsupported obj reloc %d/%d to %s", r.Type, r.Siz, r.Sym.Name) Errorf(sym, "unsupported obj reloc %d/%d to %s", r.Type, r.Siz, r.Sym.Name)
} }
relocs++ relocs++
...@@ -636,7 +636,7 @@ func (f *peFile) writeSymbols(ctxt *Link) { ...@@ -636,7 +636,7 @@ func (f *peFile) writeSymbols(ctxt *Link) {
} }
// Only windows/386 requires underscore prefix on external symbols. // Only windows/386 requires underscore prefix on external symbols.
if SysArch.Family == sys.I386 && if ctxt.Arch.Family == sys.I386 &&
Linkmode == LinkExternal && Linkmode == LinkExternal &&
(s.Type == SHOSTOBJ || s.Attr.CgoExport()) { (s.Type == SHOSTOBJ || s.Attr.CgoExport()) {
s.Name = "_" + s.Name s.Name = "_" + s.Name
...@@ -705,12 +705,12 @@ func (f *peFile) writeSymbolTableAndStringTable(ctxt *Link) { ...@@ -705,12 +705,12 @@ func (f *peFile) writeSymbolTableAndStringTable(ctxt *Link) {
} }
// writeFileHeader writes COFF file header for peFile f. // writeFileHeader writes COFF file header for peFile f.
func (f *peFile) writeFileHeader() { func (f *peFile) writeFileHeader(arch *sys.Arch) {
var fh pe.FileHeader var fh pe.FileHeader
switch SysArch.Family { switch arch.Family {
default: default:
Exitf("unknown PE architecture: %v", SysArch.Family) Exitf("unknown PE architecture: %v", arch.Family)
case sys.AMD64: case sys.AMD64:
fh.Machine = IMAGE_FILE_MACHINE_AMD64 fh.Machine = IMAGE_FILE_MACHINE_AMD64
case sys.I386: case sys.I386:
...@@ -865,7 +865,7 @@ var pefile peFile ...@@ -865,7 +865,7 @@ var pefile peFile
func Peinit(ctxt *Link) { func Peinit(ctxt *Link) {
var l int var l int
switch SysArch.Family { switch ctxt.Arch.Family {
// 64-bit architectures // 64-bit architectures
case sys.AMD64: case sys.AMD64:
pe64 = 1 pe64 = 1
...@@ -923,7 +923,7 @@ func pewrite(ctxt *Link) { ...@@ -923,7 +923,7 @@ func pewrite(ctxt *Link) {
strnput("PE", 4) strnput("PE", 4)
} }
pefile.writeFileHeader() pefile.writeFileHeader(ctxt.Arch)
pefile.writeOptionalHeader(ctxt) pefile.writeOptionalHeader(ctxt)
...@@ -976,7 +976,7 @@ func initdynimport(ctxt *Link) *Dll { ...@@ -976,7 +976,7 @@ func initdynimport(ctxt *Link) *Dll {
if err != nil { if err != nil {
Errorf(s, "failed to parse stdcall decoration: %v", err) Errorf(s, "failed to parse stdcall decoration: %v", err)
} }
m.argsize *= SysArch.PtrSize m.argsize *= ctxt.Arch.PtrSize
s.Extname = s.Extname[:i] s.Extname = s.Extname[:i]
} }
...@@ -990,10 +990,10 @@ func initdynimport(ctxt *Link) *Dll { ...@@ -990,10 +990,10 @@ func initdynimport(ctxt *Link) *Dll {
for d := dr; d != nil; d = d.next { for d := dr; d != nil; d = d.next {
for m = d.ms; m != nil; m = m.next { for m = d.ms; m != nil; m = m.next {
m.s.Type = SDATA m.s.Type = SDATA
Symgrow(m.s, int64(SysArch.PtrSize)) Symgrow(m.s, int64(ctxt.Arch.PtrSize))
dynName := m.s.Extname dynName := m.s.Extname
// only windows/386 requires stdcall decoration // only windows/386 requires stdcall decoration
if SysArch.Family == sys.I386 && m.argsize >= 0 { if ctxt.Arch.Family == sys.I386 && m.argsize >= 0 {
dynName += fmt.Sprintf("@%d", m.argsize) dynName += fmt.Sprintf("@%d", m.argsize)
} }
dynSym := ctxt.Syms.Lookup(dynName, 0) dynSym := ctxt.Syms.Lookup(dynName, 0)
...@@ -1002,7 +1002,7 @@ func initdynimport(ctxt *Link) *Dll { ...@@ -1002,7 +1002,7 @@ func initdynimport(ctxt *Link) *Dll {
r := Addrel(m.s) r := Addrel(m.s)
r.Sym = dynSym r.Sym = dynSym
r.Off = 0 r.Off = 0
r.Siz = uint8(SysArch.PtrSize) r.Siz = uint8(ctxt.Arch.PtrSize)
r.Type = objabi.R_ADDR r.Type = objabi.R_ADDR
} }
} }
...@@ -1016,10 +1016,10 @@ func initdynimport(ctxt *Link) *Dll { ...@@ -1016,10 +1016,10 @@ func initdynimport(ctxt *Link) *Dll {
m.s.Sub = dynamic.Sub m.s.Sub = dynamic.Sub
dynamic.Sub = m.s dynamic.Sub = m.s
m.s.Value = dynamic.Size m.s.Value = dynamic.Size
dynamic.Size += int64(SysArch.PtrSize) dynamic.Size += int64(ctxt.Arch.PtrSize)
} }
dynamic.Size += int64(SysArch.PtrSize) dynamic.Size += int64(ctxt.Arch.PtrSize)
} }
} }
...@@ -1285,9 +1285,9 @@ func addpersrc(ctxt *Link) { ...@@ -1285,9 +1285,9 @@ func addpersrc(ctxt *Link) {
} }
func Asmbpe(ctxt *Link) { func Asmbpe(ctxt *Link) {
switch SysArch.Family { switch ctxt.Arch.Family {
default: default:
Exitf("unknown PE architecture: %v", SysArch.Family) Exitf("unknown PE architecture: %v", ctxt.Arch.Family)
case sys.AMD64, sys.I386: case sys.AMD64, sys.I386:
} }
......
src/cmd/link/internal/ld/symtab.go
View file @ 5d95de20
...@@ -147,7 +147,7 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S ...@@ -147,7 +147,7 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S
if x.Type&SHIDDEN != 0 { if x.Type&SHIDDEN != 0 {
other = STV_HIDDEN other = STV_HIDDEN
} }
if SysArch.Family == sys.PPC64 && typ == STT_FUNC && x.Attr.Shared() && x.Name != "runtime.duffzero" && x.Name != "runtime.duffcopy" { if ctxt.Arch.Family == sys.PPC64 && typ == STT_FUNC && x.Attr.Shared() && x.Name != "runtime.duffzero" && x.Name != "runtime.duffcopy" {
// On ppc64 the top three bits of the st_other field indicate how // On ppc64 the top three bits of the st_other field indicate how
// many instructions separate the global and local entry points. In // many instructions separate the global and local entry points. In
// our case it is two instructions, indicated by the value 3. // our case it is two instructions, indicated by the value 3.
...@@ -225,7 +225,7 @@ func putplan9sym(ctxt *Link, x *Symbol, s string, typ SymbolType, addr int64, go ...@@ -225,7 +225,7 @@ func putplan9sym(ctxt *Link, x *Symbol, s string, typ SymbolType, addr int64, go
case AutoSym, ParamSym, FrameSym: case AutoSym, ParamSym, FrameSym:
l := 4 l := 4
if Headtype == objabi.Hplan9 && SysArch.Family == sys.AMD64 && !Flag8 { if Headtype == objabi.Hplan9 && ctxt.Arch.Family == sys.AMD64 && !Flag8 {
Lputb(uint32(addr >> 32)) Lputb(uint32(addr >> 32))
l = 8 l = 8
} }
...@@ -313,7 +313,7 @@ func textsectionmap(ctxt *Link) uint32 { ...@@ -313,7 +313,7 @@ func textsectionmap(ctxt *Link) uint32 {
break break
} }
} }
Symgrow(t, 3*nsections*int64(SysArch.PtrSize)) Symgrow(t, 3*nsections*int64(ctxt.Arch.PtrSize))
off := int64(0) off := int64(0)
n := 0 n := 0
......
src/cmd/link/internal/ld/typelink.go
View file @ 5d95de20
...@@ -27,7 +27,7 @@ func (ctxt *Link) typelink() { ...@@ -27,7 +27,7 @@ func (ctxt *Link) typelink() {
typelinks := byTypeStr{} typelinks := byTypeStr{}
for _, s := range ctxt.Syms.Allsym { for _, s := range ctxt.Syms.Allsym {
if s.Attr.Reachable() && s.Attr.MakeTypelink() { if s.Attr.Reachable() && s.Attr.MakeTypelink() {
typelinks = append(typelinks, typelinkSortKey{decodetypeStr(s), s}) typelinks = append(typelinks, typelinkSortKey{decodetypeStr(ctxt.Arch, s), s})
} }
} }
sort.Sort(typelinks) sort.Sort(typelinks)
......
src/cmd/link/internal/mips/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package mips ...@@ -32,6 +32,7 @@ package mips
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"fmt" "fmt"
"log" "log"
...@@ -75,12 +76,12 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -75,12 +76,12 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
func applyrel(r *ld.Reloc, s *ld.Symbol, val *int64, t int64) { func applyrel(arch *sys.Arch, r *ld.Reloc, s *ld.Symbol, val *int64, t int64) {
o := ld.SysArch.ByteOrder.Uint32(s.P[r.Off:]) o := arch.ByteOrder.Uint32(s.P[r.Off:])
switch r.Type { switch r.Type {
case objabi.R_ADDRMIPS, objabi.R_ADDRMIPSTLS: case objabi.R_ADDRMIPS, objabi.R_ADDRMIPSTLS:
*val = int64(o&0xffff0000 | uint32(t)&0xffff) *val = int64(o&0xffff0000 | uint32(t)&0xffff)
...@@ -111,13 +112,13 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -111,13 +112,13 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
ld.Errorf(s, "missing section for %s", rs.Name) ld.Errorf(s, "missing section for %s", rs.Name)
} }
r.Xsym = rs r.Xsym = rs
applyrel(r, s, val, r.Xadd) applyrel(ctxt.Arch, r, s, val, r.Xadd)
return true return true
case objabi.R_ADDRMIPSTLS, objabi.R_CALLMIPS, objabi.R_JMPMIPS: case objabi.R_ADDRMIPSTLS, objabi.R_CALLMIPS, objabi.R_JMPMIPS:
r.Done = false r.Done = false
r.Xsym = r.Sym r.Xsym = r.Sym
r.Xadd = r.Add r.Xadd = r.Add
applyrel(r, s, val, r.Add) applyrel(ctxt.Arch, r, s, val, r.Add)
return true return true
} }
} }
...@@ -131,7 +132,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -131,7 +132,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
return true return true
case objabi.R_ADDRMIPS, objabi.R_ADDRMIPSU: case objabi.R_ADDRMIPS, objabi.R_ADDRMIPSU:
t := ld.Symaddr(r.Sym) + r.Add t := ld.Symaddr(r.Sym) + r.Add
applyrel(r, s, val, t) applyrel(ctxt.Arch, r, s, val, t)
return true return true
case objabi.R_CALLMIPS, objabi.R_JMPMIPS: case objabi.R_CALLMIPS, objabi.R_JMPMIPS:
t := ld.Symaddr(r.Sym) + r.Add t := ld.Symaddr(r.Sym) + r.Add
...@@ -145,7 +146,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -145,7 +146,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
ld.Errorf(s, "direct call too far: %s %x", r.Sym.Name, t) ld.Errorf(s, "direct call too far: %s %x", r.Sym.Name, t)
} }
applyrel(r, s, val, t) applyrel(ctxt.Arch, r, s, val, t)
return true return true
case objabi.R_ADDRMIPSTLS: case objabi.R_ADDRMIPSTLS:
// thread pointer is at 0x7000 offset from the start of TLS data area // thread pointer is at 0x7000 offset from the start of TLS data area
...@@ -153,7 +154,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -153,7 +154,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
if t < -32768 || t >= 32678 { if t < -32768 || t >= 32678 {
ld.Errorf(s, "TLS offset out of range %d", t) ld.Errorf(s, "TLS offset out of range %d", t)
} }
applyrel(r, s, val, t) applyrel(ctxt.Arch, r, s, val, t)
return true return true
} }
......
src/cmd/link/internal/mips/obj.go
View file @ 5d95de20
...@@ -37,53 +37,55 @@ import ( ...@@ -37,53 +37,55 @@ import (
"fmt" "fmt"
) )
// Reading object files. func Init() (*sys.Arch, ld.Arch) {
arch := sys.ArchMIPS
func Init() {
if objabi.GOARCH == "mipsle" { if objabi.GOARCH == "mipsle" {
ld.SysArch = sys.ArchMIPSLE arch = sys.ArchMIPSLE
} else {
ld.SysArch = sys.ArchMIPS
} }
ld.Thearch.Funcalign = FuncAlign theArch := ld.Arch{
ld.Thearch.Maxalign = MaxAlign Funcalign: FuncAlign,
ld.Thearch.Minalign = MinAlign Maxalign: MaxAlign,
ld.Thearch.Dwarfregsp = DWARFREGSP Minalign: MinAlign,
ld.Thearch.Dwarfreglr = DWARFREGLR Dwarfregsp: DWARFREGSP,
Dwarfreglr: DWARFREGLR,
ld.Thearch.Adddynrel = adddynrel Adddynrel: adddynrel,
ld.Thearch.Archinit = archinit Archinit: archinit,
ld.Thearch.Archreloc = archreloc Archreloc: archreloc,
ld.Thearch.Archrelocvariant = archrelocvariant Archrelocvariant: archrelocvariant,
ld.Thearch.Asmb = asmb Asmb: asmb,
ld.Thearch.Elfreloc1 = elfreloc1 Elfreloc1: elfreloc1,
ld.Thearch.Elfsetupplt = elfsetupplt Elfsetupplt: elfsetupplt,
ld.Thearch.Gentext = gentext Gentext: gentext,
ld.Thearch.Machoreloc1 = machoreloc1 Machoreloc1: machoreloc1,
if ld.SysArch == sys.ArchMIPSLE {
ld.Thearch.Lput = ld.Lputl Linuxdynld: "/lib/ld.so.1",
ld.Thearch.Wput = ld.Wputl
ld.Thearch.Vput = ld.Vputl Freebsddynld: "XXX",
ld.Thearch.Append16 = ld.Append16l Openbsddynld: "XXX",
ld.Thearch.Append32 = ld.Append32l Netbsddynld: "XXX",
ld.Thearch.Append64 = ld.Append64l Dragonflydynld: "XXX",
} else { Solarisdynld: "XXX",
ld.Thearch.Lput = ld.Lputb
ld.Thearch.Wput = ld.Wputb
ld.Thearch.Vput = ld.Vputb
ld.Thearch.Append16 = ld.Append16b
ld.Thearch.Append32 = ld.Append32b
ld.Thearch.Append64 = ld.Append64b
} }
ld.Thearch.Linuxdynld = "/lib/ld.so.1" if arch == sys.ArchMIPSLE {
theArch.Lput = ld.Lputl
theArch.Wput = ld.Wputl
theArch.Vput = ld.Vputl
theArch.Append16 = ld.Append16l
theArch.Append32 = ld.Append32l
theArch.Append64 = ld.Append64l
} else {
theArch.Lput = ld.Lputb
theArch.Wput = ld.Wputb
theArch.Vput = ld.Vputb
theArch.Append16 = ld.Append16b
theArch.Append32 = ld.Append32b
theArch.Append64 = ld.Append64b
}
ld.Thearch.Freebsddynld = "XXX" return arch, theArch
ld.Thearch.Openbsddynld = "XXX"
ld.Thearch.Netbsddynld = "XXX"
ld.Thearch.Dragonflydynld = "XXX"
ld.Thearch.Solarisdynld = "XXX"
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
......
src/cmd/link/internal/mips64/asm.go
View file @ 5d95de20
...@@ -93,7 +93,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -93,7 +93,7 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -140,7 +140,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -140,7 +140,7 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
case objabi.R_ADDRMIPS, case objabi.R_ADDRMIPS,
objabi.R_ADDRMIPSU: objabi.R_ADDRMIPSU:
t := ld.Symaddr(r.Sym) + r.Add t := ld.Symaddr(r.Sym) + r.Add
o1 := ld.SysArch.ByteOrder.Uint32(s.P[r.Off:]) o1 := ctxt.Arch.ByteOrder.Uint32(s.P[r.Off:])
if r.Type == objabi.R_ADDRMIPS { if r.Type == objabi.R_ADDRMIPS {
*val = int64(o1&0xffff0000 | uint32(t)&0xffff) *val = int64(o1&0xffff0000 | uint32(t)&0xffff)
} else { } else {
...@@ -153,14 +153,14 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { ...@@ -153,14 +153,14 @@ func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
if t < -32768 || t >= 32678 { if t < -32768 || t >= 32678 {
ld.Errorf(s, "TLS offset out of range %d", t) ld.Errorf(s, "TLS offset out of range %d", t)
} }
o1 := ld.SysArch.ByteOrder.Uint32(s.P[r.Off:]) o1 := ctxt.Arch.ByteOrder.Uint32(s.P[r.Off:])
*val = int64(o1&0xffff0000 | uint32(t)&0xffff) *val = int64(o1&0xffff0000 | uint32(t)&0xffff)
return true return true
case objabi.R_CALLMIPS, case objabi.R_CALLMIPS,
objabi.R_JMPMIPS: objabi.R_JMPMIPS:
// Low 26 bits = (S + A) >> 2 // Low 26 bits = (S + A) >> 2
t := ld.Symaddr(r.Sym) + r.Add t := ld.Symaddr(r.Sym) + r.Add
o1 := ld.SysArch.ByteOrder.Uint32(s.P[r.Off:]) o1 := ctxt.Arch.ByteOrder.Uint32(s.P[r.Off:])
*val = int64(o1&0xfc000000 | uint32(t>>2)&^0xfc000000) *val = int64(o1&0xfc000000 | uint32(t>>2)&^0xfc000000)
return true return true
} }
...@@ -272,7 +272,7 @@ func asmb(ctxt *ld.Link) { ...@@ -272,7 +272,7 @@ func asmb(ctxt *ld.Link) {
default: default:
case objabi.Hplan9: /* plan 9 */ case objabi.Hplan9: /* plan 9 */
magic := uint32(4*18*18 + 7) magic := uint32(4*18*18 + 7)
if ld.SysArch == sys.ArchMIPS64LE { if ctxt.Arch == sys.ArchMIPS64LE {
magic = uint32(4*26*26 + 7) magic = uint32(4*26*26 + 7)
} }
ld.Thearch.Lput(magic) /* magic */ ld.Thearch.Lput(magic) /* magic */
......
src/cmd/link/internal/mips64/obj.go
View file @ 5d95de20
...@@ -37,51 +37,52 @@ import ( ...@@ -37,51 +37,52 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
arch := sys.ArchMIPS64
if objabi.GOARCH == "mips64le" { if objabi.GOARCH == "mips64le" {
ld.SysArch = sys.ArchMIPS64LE arch = sys.ArchMIPS64LE
} else {
ld.SysArch = sys.ArchMIPS64
} }
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
Adddynrel: adddynrel,
Archinit: archinit,
Archreloc: archreloc,
Archrelocvariant: archrelocvariant,
Asmb: asmb,
Elfreloc1: elfreloc1,
Elfsetupplt: elfsetupplt,
Gentext: gentext,
Machoreloc1: machoreloc1,
ld.Thearch.Adddynrel = adddynrel Linuxdynld: "/lib64/ld64.so.1",
ld.Thearch.Archinit = archinit Freebsddynld: "XXX",
ld.Thearch.Archreloc = archreloc Openbsddynld: "XXX",
ld.Thearch.Archrelocvariant = archrelocvariant Netbsddynld: "XXX",
ld.Thearch.Asmb = asmb Dragonflydynld: "XXX",
ld.Thearch.Elfreloc1 = elfreloc1 Solarisdynld: "XXX",
ld.Thearch.Elfsetupplt = elfsetupplt }
ld.Thearch.Gentext = gentext if arch == sys.ArchMIPS64LE {
ld.Thearch.Machoreloc1 = machoreloc1 theArch.Lput = ld.Lputl
if ld.SysArch == sys.ArchMIPS64LE { theArch.Wput = ld.Wputl
ld.Thearch.Lput = ld.Lputl theArch.Vput = ld.Vputl
ld.Thearch.Wput = ld.Wputl theArch.Append16 = ld.Append16l
ld.Thearch.Vput = ld.Vputl theArch.Append32 = ld.Append32l
ld.Thearch.Append16 = ld.Append16l theArch.Append64 = ld.Append64l
ld.Thearch.Append32 = ld.Append32l
ld.Thearch.Append64 = ld.Append64l
} else { } else {
ld.Thearch.Lput = ld.Lputb theArch.Lput = ld.Lputb
ld.Thearch.Wput = ld.Wputb theArch.Wput = ld.Wputb
ld.Thearch.Vput = ld.Vputb theArch.Vput = ld.Vputb
ld.Thearch.Append16 = ld.Append16b theArch.Append16 = ld.Append16b
ld.Thearch.Append32 = ld.Append32b theArch.Append32 = ld.Append32b
ld.Thearch.Append64 = ld.Append64b theArch.Append64 = ld.Append64b
} }
ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" return arch, theArch
ld.Thearch.Freebsddynld = "XXX"
ld.Thearch.Openbsddynld = "XXX"
ld.Thearch.Netbsddynld = "XXX"
ld.Thearch.Dragonflydynld = "XXX"
ld.Thearch.Solarisdynld = "XXX"
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
......
src/cmd/link/internal/ppc64/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package ppc64 ...@@ -32,6 +32,7 @@ package ppc64
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
...@@ -262,7 +263,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -262,7 +263,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
switch r.Type { switch r.Type {
default: default:
if r.Type >= 256 { if r.Type >= 256 {
ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
return false return false
} }
...@@ -447,7 +448,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -447,7 +448,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -570,7 +571,7 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) { ...@@ -570,7 +571,7 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) {
ld.Errorf(s, "unexpected trampoline for shared or dynamic linking\n") ld.Errorf(s, "unexpected trampoline for shared or dynamic linking\n")
} else { } else {
ctxt.AddTramp(tramp) ctxt.AddTramp(tramp)
gentramp(tramp, r.Sym, int64(r.Add)) gentramp(ctxt.Arch, tramp, r.Sym, int64(r.Add))
} }
} }
r.Sym = tramp r.Sym = tramp
...@@ -578,11 +579,11 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) { ...@@ -578,11 +579,11 @@ func trampoline(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol) {
r.Done = false r.Done = false
} }
default: default:
ld.Errorf(s, "trampoline called with non-jump reloc: %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "trampoline called with non-jump reloc: %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
} }
} }
func gentramp(tramp, target *ld.Symbol, offset int64) { func gentramp(arch *sys.Arch, tramp, target *ld.Symbol, offset int64) {
// Used for default build mode for an executable // Used for default build mode for an executable
// Address of the call target is generated using // Address of the call target is generated using
// relocation and doesn't depend on r2 (TOC). // relocation and doesn't depend on r2 (TOC).
...@@ -612,10 +613,10 @@ func gentramp(tramp, target *ld.Symbol, offset int64) { ...@@ -612,10 +613,10 @@ func gentramp(tramp, target *ld.Symbol, offset int64) {
} }
o3 := uint32(0x7fe903a6) // mtctr r31 o3 := uint32(0x7fe903a6) // mtctr r31
o4 := uint32(0x4e800420) // bctr o4 := uint32(0x4e800420) // bctr
ld.SysArch.ByteOrder.PutUint32(tramp.P, o1) arch.ByteOrder.PutUint32(tramp.P, o1)
ld.SysArch.ByteOrder.PutUint32(tramp.P[4:], o2) arch.ByteOrder.PutUint32(tramp.P[4:], o2)
ld.SysArch.ByteOrder.PutUint32(tramp.P[8:], o3) arch.ByteOrder.PutUint32(tramp.P[8:], o3)
ld.SysArch.ByteOrder.PutUint32(tramp.P[12:], o4) arch.ByteOrder.PutUint32(tramp.P[12:], o4)
} }
func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool { func archreloc(ctxt *ld.Link, r *ld.Reloc, s *ld.Symbol, val *int64) bool {
......
src/cmd/link/internal/ppc64/obj.go
View file @ 5d95de20
...@@ -37,53 +37,57 @@ import ( ...@@ -37,53 +37,57 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
arch := sys.ArchPPC64
if objabi.GOARCH == "ppc64le" { if objabi.GOARCH == "ppc64le" {
ld.SysArch = sys.ArchPPC64LE arch = sys.ArchPPC64LE
} else {
ld.SysArch = sys.ArchPPC64
} }
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel Adddynrel: adddynrel,
ld.Thearch.Archinit = archinit Archinit: archinit,
ld.Thearch.Archreloc = archreloc Archreloc: archreloc,
ld.Thearch.Archrelocvariant = archrelocvariant Archrelocvariant: archrelocvariant,
ld.Thearch.Asmb = asmb Asmb: asmb,
ld.Thearch.Elfreloc1 = elfreloc1 Elfreloc1: elfreloc1,
ld.Thearch.Elfsetupplt = elfsetupplt Elfsetupplt: elfsetupplt,
ld.Thearch.Gentext = gentext Gentext: gentext,
ld.Thearch.Trampoline = trampoline Trampoline: trampoline,
ld.Thearch.Machoreloc1 = machoreloc1 Machoreloc1: machoreloc1,
if ld.SysArch == sys.ArchPPC64LE {
ld.Thearch.Lput = ld.Lputl // TODO(austin): ABI v1 uses /usr/lib/ld.so.1,
ld.Thearch.Wput = ld.Wputl Linuxdynld: "/lib64/ld64.so.1",
ld.Thearch.Vput = ld.Vputl
ld.Thearch.Append16 = ld.Append16l Freebsddynld: "XXX",
ld.Thearch.Append32 = ld.Append32l Openbsddynld: "XXX",
ld.Thearch.Append64 = ld.Append64l Netbsddynld: "XXX",
} else { Dragonflydynld: "XXX",
ld.Thearch.Lput = ld.Lputb Solarisdynld: "XXX",
ld.Thearch.Wput = ld.Wputb
ld.Thearch.Vput = ld.Vputb
ld.Thearch.Append16 = ld.Append16b
ld.Thearch.Append32 = ld.Append32b
ld.Thearch.Append64 = ld.Append64b
} }
// TODO(austin): ABI v1 uses /usr/lib/ld.so.1 if arch == sys.ArchPPC64LE {
ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" theArch.Lput = ld.Lputl
theArch.Wput = ld.Wputl
theArch.Vput = ld.Vputl
theArch.Append16 = ld.Append16l
theArch.Append32 = ld.Append32l
theArch.Append64 = ld.Append64l
} else {
theArch.Lput = ld.Lputb
theArch.Wput = ld.Wputb
theArch.Vput = ld.Vputb
theArch.Append16 = ld.Append16b
theArch.Append32 = ld.Append32b
theArch.Append64 = ld.Append64b
}
ld.Thearch.Freebsddynld = "XXX" return arch, theArch
ld.Thearch.Openbsddynld = "XXX"
ld.Thearch.Netbsddynld = "XXX"
ld.Thearch.Dragonflydynld = "XXX"
ld.Thearch.Solarisdynld = "XXX"
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
...@@ -105,7 +109,7 @@ func archinit(ctxt *ld.Link) { ...@@ -105,7 +109,7 @@ func archinit(ctxt *ld.Link) {
} }
case objabi.Hlinux: /* ppc64 elf */ case objabi.Hlinux: /* ppc64 elf */
if ld.SysArch == sys.ArchPPC64 { if ctxt.Arch == sys.ArchPPC64 {
*ld.FlagD = true // TODO(austin): ELF ABI v1 not supported yet *ld.FlagD = true // TODO(austin): ELF ABI v1 not supported yet
} }
ld.Elfinit(ctxt) ld.Elfinit(ctxt)
......
src/cmd/link/internal/s390x/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package s390x ...@@ -32,6 +32,7 @@ package s390x
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"debug/elf" "debug/elf"
"fmt" "fmt"
...@@ -376,7 +377,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -376,7 +377,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
......
src/cmd/link/internal/s390x/obj.go
View file @ 5d95de20
...@@ -37,39 +37,43 @@ import ( ...@@ -37,39 +37,43 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
ld.SysArch = sys.ArchS390X arch := sys.ArchS390X
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel Adddynrel: adddynrel,
ld.Thearch.Archinit = archinit Archinit: archinit,
ld.Thearch.Archreloc = archreloc Archreloc: archreloc,
ld.Thearch.Archrelocvariant = archrelocvariant Archrelocvariant: archrelocvariant,
ld.Thearch.Asmb = asmb // in asm.go Asmb: asmb, // in asm.go
ld.Thearch.Elfreloc1 = elfreloc1 Elfreloc1: elfreloc1,
ld.Thearch.Elfsetupplt = elfsetupplt Elfsetupplt: elfsetupplt,
ld.Thearch.Gentext = gentext Gentext: gentext,
ld.Thearch.Machoreloc1 = machoreloc1 Machoreloc1: machoreloc1,
ld.Thearch.Lput = ld.Lputb Lput: ld.Lputb,
ld.Thearch.Wput = ld.Wputb Wput: ld.Wputb,
ld.Thearch.Vput = ld.Vputb Vput: ld.Vputb,
ld.Thearch.Append16 = ld.Append16b Append16: ld.Append16b,
ld.Thearch.Append32 = ld.Append32b Append32: ld.Append32b,
ld.Thearch.Append64 = ld.Append64b Append64: ld.Append64b,
ld.Thearch.Linuxdynld = "/lib64/ld64.so.1" Linuxdynld: "/lib64/ld64.so.1",
// not relevant for s390x // not relevant for s390x
ld.Thearch.Freebsddynld = "XXX" Freebsddynld: "XXX",
ld.Thearch.Openbsddynld = "XXX" Openbsddynld: "XXX",
ld.Thearch.Netbsddynld = "XXX" Netbsddynld: "XXX",
ld.Thearch.Dragonflydynld = "XXX" Dragonflydynld: "XXX",
ld.Thearch.Solarisdynld = "XXX" Solarisdynld: "XXX",
}
return arch, theArch
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
......
src/cmd/link/internal/x86/asm.go
View file @ 5d95de20
...@@ -32,6 +32,7 @@ package x86 ...@@ -32,6 +32,7 @@ package x86
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/ld" "cmd/link/internal/ld"
"log" "log"
) )
...@@ -170,7 +171,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -170,7 +171,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
switch r.Type { switch r.Type {
default: default:
if r.Type >= 256 { if r.Type >= 256 {
ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(r.Type)) ld.Errorf(s, "unexpected relocation type %d (%s)", r.Type, ld.RelocName(ctxt.Arch, r.Type))
return false return false
} }
...@@ -311,7 +312,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -311,7 +312,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
return true return true
} }
if ld.Headtype == objabi.Hdarwin && s.Size == int64(ld.SysArch.PtrSize) && r.Off == 0 { if ld.Headtype == objabi.Hdarwin && s.Size == int64(ctxt.Arch.PtrSize) && r.Off == 0 {
// Mach-O relocations are a royal pain to lay out. // Mach-O relocations are a royal pain to lay out.
// They use a compact stateful bytecode representation // They use a compact stateful bytecode representation
// that is too much bother to deal with. // that is too much bother to deal with.
...@@ -398,14 +399,14 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -398,14 +399,14 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return true return true
} }
func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
if rs.Type == ld.SHOSTOBJ { if rs.Type == ld.SHOSTOBJ {
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-macho symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
...@@ -414,7 +415,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -414,7 +415,7 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
} else { } else {
v = uint32(rs.Sect.Extnum) v = uint32(rs.Sect.Extnum)
if v == 0 { if v == 0 {
ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to symbol %s in non-macho section %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Sect.Name, rs.Type, rs.Type)
return false return false
} }
} }
...@@ -448,13 +449,13 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -448,13 +449,13 @@ func machoreloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return true return true
} }
func pereloc1(s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
if rs.Dynid < 0 { if rs.Dynid < 0 {
ld.Errorf(s, "reloc %d (%s) to non-coff symbol %s type=%d (%s)", r.Type, ld.RelocName(r.Type), rs.Name, rs.Type, rs.Type) ld.Errorf(s, "reloc %d (%s) to non-coff symbol %s type=%d (%s)", r.Type, ld.RelocName(arch, r.Type), rs.Name, rs.Type, rs.Type)
return false return false
} }
......
src/cmd/link/internal/x86/obj.go
View file @ 5d95de20
...@@ -37,37 +37,41 @@ import ( ...@@ -37,37 +37,41 @@ import (
"fmt" "fmt"
) )
func Init() { func Init() (*sys.Arch, ld.Arch) {
ld.SysArch = sys.Arch386 arch := sys.Arch386
ld.Thearch.Funcalign = funcAlign theArch := ld.Arch{
ld.Thearch.Maxalign = maxAlign Funcalign: funcAlign,
ld.Thearch.Minalign = minAlign Maxalign: maxAlign,
ld.Thearch.Dwarfregsp = dwarfRegSP Minalign: minAlign,
ld.Thearch.Dwarfreglr = dwarfRegLR Dwarfregsp: dwarfRegSP,
Dwarfreglr: dwarfRegLR,
ld.Thearch.Adddynrel = adddynrel
ld.Thearch.Archinit = archinit Adddynrel: adddynrel,
ld.Thearch.Archreloc = archreloc Archinit: archinit,
ld.Thearch.Archrelocvariant = archrelocvariant Archreloc: archreloc,
ld.Thearch.Asmb = asmb Archrelocvariant: archrelocvariant,
ld.Thearch.Elfreloc1 = elfreloc1 Asmb: asmb,
ld.Thearch.Elfsetupplt = elfsetupplt Elfreloc1: elfreloc1,
ld.Thearch.Gentext = gentext Elfsetupplt: elfsetupplt,
ld.Thearch.Machoreloc1 = machoreloc1 Gentext: gentext,
ld.Thearch.PEreloc1 = pereloc1 Machoreloc1: machoreloc1,
ld.Thearch.Lput = ld.Lputl PEreloc1: pereloc1,
ld.Thearch.Wput = ld.Wputl Lput: ld.Lputl,
ld.Thearch.Vput = ld.Vputl Wput: ld.Wputl,
ld.Thearch.Append16 = ld.Append16l Vput: ld.Vputl,
ld.Thearch.Append32 = ld.Append32l Append16: ld.Append16l,
ld.Thearch.Append64 = ld.Append64l Append32: ld.Append32l,
Append64: ld.Append64l,
ld.Thearch.Linuxdynld = "/lib/ld-linux.so.2"
ld.Thearch.Freebsddynld = "/usr/libexec/ld-elf.so.1" Linuxdynld: "/lib/ld-linux.so.2",
ld.Thearch.Openbsddynld = "/usr/libexec/ld.so" Freebsddynld: "/usr/libexec/ld-elf.so.1",
ld.Thearch.Netbsddynld = "/usr/libexec/ld.elf_so" Openbsddynld: "/usr/libexec/ld.so",
ld.Thearch.Solarisdynld = "/lib/ld.so.1" Netbsddynld: "/usr/libexec/ld.elf_so",
Solarisdynld: "/lib/ld.so.1",
}
return arch, theArch
} }
func archinit(ctxt *ld.Link) { func archinit(ctxt *ld.Link) {
...@@ -89,8 +93,6 @@ func archinit(ctxt *ld.Link) { ...@@ -89,8 +93,6 @@ func archinit(ctxt *ld.Link) {
} }
case objabi.Hdarwin: /* apple MACH */ case objabi.Hdarwin: /* apple MACH */
ld.Machoinit()
ld.HEADR = ld.INITIAL_MACHO_HEADR ld.HEADR = ld.INITIAL_MACHO_HEADR
if *ld.FlagTextAddr == -1 { if *ld.FlagTextAddr == -1 {
*ld.FlagTextAddr = 4096 + int64(ld.HEADR) *ld.FlagTextAddr = 4096 + int64(ld.HEADR)
......
src/cmd/link/main.go
View file @ 5d95de20
...@@ -6,6 +6,7 @@ package main ...@@ -6,6 +6,7 @@ package main
import ( import (
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"cmd/link/internal/amd64" "cmd/link/internal/amd64"
"cmd/link/internal/arm" "cmd/link/internal/arm"
"cmd/link/internal/arm64" "cmd/link/internal/arm64"
...@@ -26,7 +27,7 @@ import ( ...@@ -26,7 +27,7 @@ import (
// //
// Before any argument parsing is done, the Init function of relevant // Before any argument parsing is done, the Init function of relevant
// architecture package is called. The only job done in Init is // architecture package is called. The only job done in Init is
// configuration of the ld.Thearch and ld.SysArch variables. // configuration of the architecture-specific variables.
// //
// Then control flow passes to ld.Main, which parses flags, makes // Then control flow passes to ld.Main, which parses flags, makes
// some configuration decisions, and then gives the architecture // some configuration decisions, and then gives the architecture
...@@ -34,26 +35,29 @@ import ( ...@@ -34,26 +35,29 @@ import (
// via the ld.Thearch.Archinit function. // via the ld.Thearch.Archinit function.
func main() { func main() {
var arch *sys.Arch
var theArch ld.Arch
switch objabi.GOARCH { switch objabi.GOARCH {
default: default:
fmt.Fprintf(os.Stderr, "link: unknown architecture %q\n", objabi.GOARCH) fmt.Fprintf(os.Stderr, "link: unknown architecture %q\n", objabi.GOARCH)
os.Exit(2) os.Exit(2)
case "386": case "386":
x86.Init() arch, theArch = x86.Init()
case "amd64", "amd64p32": case "amd64", "amd64p32":
amd64.Init() arch, theArch = amd64.Init()
case "arm": case "arm":
arm.Init() arch, theArch = arm.Init()
case "arm64": case "arm64":
arm64.Init() arch, theArch = arm64.Init()
case "mips", "mipsle": case "mips", "mipsle":
mips.Init() arch, theArch = mips.Init()
case "mips64", "mips64le": case "mips64", "mips64le":
mips64.Init() arch, theArch = mips64.Init()
case "ppc64", "ppc64le": case "ppc64", "ppc64le":
ppc64.Init() arch, theArch = ppc64.Init()
case "s390x": case "s390x":
s390x.Init() arch, theArch = s390x.Init()
} }
ld.Main() ld.Main(arch, theArch)
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7