Skip to content

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

cmd/link: remove coutbuf global variable 

Begin passing coutbuf by as a parameter. To make the initial plumbing
pass easier, it is also a field in the standard ctxt parameter.

Consolidate the byte writing functions into the OutBuf object.
The result is less architecture-dependent initialization.

To avoid plumbing out everywhere we want to report an error, move
handling of out file deletion to an AtExit function.

For #22095

Change-Id: I0863695241562e0662ae3669666c7922b8c846f9
Reviewed-on: https://go-review.googlesource.com/67318
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarIan Lance Taylor <iant@golang.org>
parent 5d95de20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 880 deletions
src/cmd/link/internal/amd64/asm.go
View file @ 5fe9bbcf
...@@ -361,7 +361,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -361,7 +361,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Vput(uint64(sectoff)) ctxt.Out.Write64(uint64(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -369,21 +369,21 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -369,21 +369,21 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return false return false
case objabi.R_ADDR: case objabi.R_ADDR:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Vput(ld.R_X86_64_32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_32 | uint64(elfsym)<<32)
} else if r.Siz == 8 { } else if r.Siz == 8 {
ld.Thearch.Vput(ld.R_X86_64_64 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_64 | uint64(elfsym)<<32)
} else { } else {
return false return false
} }
case objabi.R_TLS_LE: case objabi.R_TLS_LE:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Vput(ld.R_X86_64_TPOFF32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_TPOFF32 | uint64(elfsym)<<32)
} else { } else {
return false return false
} }
case objabi.R_TLS_IE: case objabi.R_TLS_IE:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Vput(ld.R_X86_64_GOTTPOFF | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_GOTTPOFF | uint64(elfsym)<<32)
} else { } else {
return false return false
} }
...@@ -391,12 +391,12 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -391,12 +391,12 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
if r.Siz == 4 { if r.Siz == 4 {
if r.Xsym.Type == ld.SDYNIMPORT { if r.Xsym.Type == ld.SDYNIMPORT {
if ctxt.DynlinkingGo() { if ctxt.DynlinkingGo() {
ld.Thearch.Vput(ld.R_X86_64_PLT32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_PLT32 | uint64(elfsym)<<32)
} else { } else {
ld.Thearch.Vput(ld.R_X86_64_GOTPCREL | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_GOTPCREL | uint64(elfsym)<<32)
} }
} else { } else {
ld.Thearch.Vput(ld.R_X86_64_PC32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_PC32 | uint64(elfsym)<<32)
} }
} else { } else {
return false return false
...@@ -404,26 +404,26 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -404,26 +404,26 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
case objabi.R_PCREL: case objabi.R_PCREL:
if r.Siz == 4 { if r.Siz == 4 {
if r.Xsym.Type == ld.SDYNIMPORT && r.Xsym.ElfType == elf.STT_FUNC { if r.Xsym.Type == ld.SDYNIMPORT && r.Xsym.ElfType == elf.STT_FUNC {
ld.Thearch.Vput(ld.R_X86_64_PLT32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_PLT32 | uint64(elfsym)<<32)
} else { } else {
ld.Thearch.Vput(ld.R_X86_64_PC32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_PC32 | uint64(elfsym)<<32)
} }
} else { } else {
return false return false
} }
case objabi.R_GOTPCREL: case objabi.R_GOTPCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Vput(ld.R_X86_64_GOTPCREL | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_X86_64_GOTPCREL | uint64(elfsym)<<32)
} else { } else {
return false return false
} }
} }
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
return true return true
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -481,12 +481,12 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -481,12 +481,12 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
v |= 3 << 25 v |= 3 << 25
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(v) out.Write32(v)
return true return true
} }
func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func pereloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -496,8 +496,8 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -496,8 +496,8 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(uint32(rs.Dynid)) out.Write32(uint32(rs.Dynid))
switch r.Type { switch r.Type {
default: default:
...@@ -518,7 +518,7 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -518,7 +518,7 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
v = ld.IMAGE_REL_AMD64_REL32 v = ld.IMAGE_REL_AMD64_REL32
} }
ld.Thearch.Wput(uint16(v)) out.Write16(uint16(v))
return true return true
} }
...@@ -663,11 +663,11 @@ func asmb(ctxt *ld.Link) { ...@@ -663,11 +663,11 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
// 0xCC is INT $3 - breakpoint instruction // 0xCC is INT $3 - breakpoint instruction
ld.CodeblkPad(ctxt, int64(sect.Vaddr), int64(sect.Length), []byte{0xCC}) ld.CodeblkPad(ctxt, int64(sect.Vaddr), int64(sect.Length), []byte{0xCC})
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -675,14 +675,14 @@ func asmb(ctxt *ld.Link) { ...@@ -675,14 +675,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -690,10 +690,10 @@ func asmb(ctxt *ld.Link) { ...@@ -690,10 +690,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
machlink := int64(0) machlink := int64(0)
...@@ -757,14 +757,14 @@ func asmb(ctxt *ld.Link) { ...@@ -757,14 +757,14 @@ func asmb(ctxt *ld.Link) {
symo = ld.Rnd(symo, ld.PEFILEALIGN) symo = ld.Rnd(symo, ld.PEFILEALIGN)
} }
ld.Cseek(symo) ctxt.Out.SeekSet(symo)
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
ld.Cseek(symo) ctxt.Out.SeekSet(symo)
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) ctxt.Logf("%5.2f dwarf\n", ld.Cputime())
...@@ -777,13 +777,13 @@ func asmb(ctxt *ld.Link) { ...@@ -777,13 +777,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
case objabi.Hwindows: case objabi.Hwindows:
...@@ -801,23 +801,23 @@ func asmb(ctxt *ld.Link) { ...@@ -801,23 +801,23 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f headr\n", ld.Cputime()) ctxt.Logf("%5.2f headr\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan9 */ case objabi.Hplan9: /* plan9 */
magic := int32(4*26*26 + 7) magic := int32(4*26*26 + 7)
magic |= 0x00008000 /* fat header */ magic |= 0x00008000 /* fat header */
ld.Lputb(uint32(magic)) /* magic */ ctxt.Out.Write32b(uint32(magic)) /* magic */
ld.Lputb(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32b(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Lputb(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32b(uint32(ld.Symsize)) /* nsyms */
vl := ld.Entryvalue(ctxt) vl := ld.Entryvalue(ctxt)
ld.Lputb(PADDR(uint32(vl))) /* va of entry */ ctxt.Out.Write32b(PADDR(uint32(vl))) /* va of entry */
ld.Lputb(uint32(ld.Spsize)) /* sp offsets */ ctxt.Out.Write32b(uint32(ld.Spsize)) /* sp offsets */
ld.Lputb(uint32(ld.Lcsize)) /* line offsets */ ctxt.Out.Write32b(uint32(ld.Lcsize)) /* line offsets */
ld.Vputb(uint64(vl)) /* va of entry */ ctxt.Out.Write64b(uint64(vl)) /* va of entry */
case objabi.Hdarwin: case objabi.Hdarwin:
ld.Asmbmacho(ctxt) ld.Asmbmacho(ctxt)
...@@ -835,7 +835,7 @@ func asmb(ctxt *ld.Link) { ...@@ -835,7 +835,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbpe(ctxt) ld.Asmbpe(ctxt)
} }
ld.Cflush() ctxt.Out.Flush()
} }
func tlsIEtoLE(s *ld.Symbol, off, size int) { func tlsIEtoLE(s *ld.Symbol, off, size int) {
......
src/cmd/link/internal/amd64/obj.go
View file @ 5fe9bbcf
...@@ -60,12 +60,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -60,12 +60,6 @@ func Init() (*sys.Arch, ld.Arch) {
Gentext: gentext, Gentext: gentext,
Machoreloc1: machoreloc1, Machoreloc1: machoreloc1,
PEreloc1: pereloc1, PEreloc1: pereloc1,
Lput: ld.Lputl,
Wput: ld.Wputl,
Vput: ld.Vputl,
Append16: ld.Append16l,
Append32: ld.Append32l,
Append64: ld.Append64l,
TLSIEtoLE: tlsIEtoLE, TLSIEtoLE: tlsIEtoLE,
Linuxdynld: "/lib64/ld-linux-x86-64.so.2", Linuxdynld: "/lib64/ld-linux-x86-64.so.2",
......
src/cmd/link/internal/arm/asm.go
View file @ 5fe9bbcf
...@@ -251,7 +251,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -251,7 +251,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Lput(uint32(sectoff)) ctxt.Out.Write32(uint32(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -259,33 +259,33 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -259,33 +259,33 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return false return false
case objabi.R_ADDR: case objabi.R_ADDR:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_ARM_ABS32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_ABS32 | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
case objabi.R_PCREL: case objabi.R_PCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_ARM_REL32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_REL32 | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
case objabi.R_CALLARM: case objabi.R_CALLARM:
if r.Siz == 4 { if r.Siz == 4 {
if r.Add&0xff000000 == 0xeb000000 { // BL if r.Add&0xff000000 == 0xeb000000 { // BL
ld.Thearch.Lput(ld.R_ARM_CALL | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_CALL | uint32(elfsym)<<8)
} else { } else {
ld.Thearch.Lput(ld.R_ARM_JUMP24 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_JUMP24 | uint32(elfsym)<<8)
} }
} else { } else {
return false return false
} }
case objabi.R_TLS_LE: case objabi.R_TLS_LE:
ld.Thearch.Lput(ld.R_ARM_TLS_LE32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_TLS_LE32 | uint32(elfsym)<<8)
case objabi.R_TLS_IE: case objabi.R_TLS_IE:
ld.Thearch.Lput(ld.R_ARM_TLS_IE32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_TLS_IE32 | uint32(elfsym)<<8)
case objabi.R_GOTPCREL: case objabi.R_GOTPCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_ARM_GOT_PREL | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_ARM_GOT_PREL | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
...@@ -321,7 +321,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -321,7 +321,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -349,10 +349,10 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -349,10 +349,10 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
o2 |= ld.MACHO_ARM_RELOC_PAIR << 24 o2 |= ld.MACHO_ARM_RELOC_PAIR << 24
o2 |= 2 << 28 // size = 4 o2 |= 2 << 28 // size = 4
ld.Thearch.Lput(o1) out.Write32(o1)
ld.Thearch.Lput(uint32(ld.Symaddr(rs))) out.Write32(uint32(ld.Symaddr(rs)))
ld.Thearch.Lput(o2) out.Write32(o2)
ld.Thearch.Lput(uint32(s.Value + int64(r.Off))) out.Write32(uint32(s.Value + int64(r.Off)))
return true return true
} }
...@@ -400,8 +400,8 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -400,8 +400,8 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
v |= 3 << 25 v |= 3 << 25
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(v) out.Write32(v)
return true return true
} }
...@@ -746,10 +746,10 @@ func asmb(ctxt *ld.Link) { ...@@ -746,10 +746,10 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -757,14 +757,14 @@ func asmb(ctxt *ld.Link) { ...@@ -757,14 +757,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -772,10 +772,10 @@ func asmb(ctxt *ld.Link) { ...@@ -772,10 +772,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
machlink := uint32(0) machlink := uint32(0)
...@@ -807,7 +807,7 @@ func asmb(ctxt *ld.Link) { ...@@ -807,7 +807,7 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdwarf.Fileoff + uint64(ld.Rnd(int64(ld.Segdwarf.Filelen), int64(*ld.FlagRound))) + uint64(machlink)) symo = uint32(ld.Segdwarf.Fileoff + uint64(ld.Rnd(int64(ld.Segdwarf.Filelen), int64(*ld.FlagRound))) + uint64(machlink))
} }
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
...@@ -815,8 +815,8 @@ func asmb(ctxt *ld.Link) { ...@@ -815,8 +815,8 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
ld.Elfemitreloc(ctxt) ld.Elfemitreloc(ctxt)
...@@ -825,13 +825,13 @@ func asmb(ctxt *ld.Link) { ...@@ -825,13 +825,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
case objabi.Hdarwin: case objabi.Hdarwin:
...@@ -844,18 +844,18 @@ func asmb(ctxt *ld.Link) { ...@@ -844,18 +844,18 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan 9 */ case objabi.Hplan9: /* plan 9 */
ld.Lputb(0x647) /* magic */ ctxt.Out.Write32b(0x647) /* magic */
ld.Lputb(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32b(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Lputb(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32b(uint32(ld.Symsize)) /* nsyms */
ld.Lputb(uint32(ld.Entryvalue(ctxt))) /* va of entry */ ctxt.Out.Write32b(uint32(ld.Entryvalue(ctxt))) /* va of entry */
ld.Lputb(0) ctxt.Out.Write32b(0)
ld.Lputb(uint32(ld.Lcsize)) ctxt.Out.Write32b(uint32(ld.Lcsize))
case objabi.Hlinux, case objabi.Hlinux,
objabi.Hfreebsd, objabi.Hfreebsd,
...@@ -868,7 +868,7 @@ func asmb(ctxt *ld.Link) { ...@@ -868,7 +868,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbmacho(ctxt) ld.Asmbmacho(ctxt)
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/arm/obj.go
View file @ 5fe9bbcf
...@@ -57,12 +57,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -57,12 +57,6 @@ func Init() (*sys.Arch, ld.Arch) {
Elfsetupplt: elfsetupplt, Elfsetupplt: elfsetupplt,
Gentext: gentext, Gentext: gentext,
Machoreloc1: machoreloc1, Machoreloc1: machoreloc1,
Lput: ld.Lputl,
Wput: ld.Wputl,
Vput: ld.Vputl,
Append16: ld.Append16l,
Append32: ld.Append32l,
Append64: ld.Append64l,
Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI Linuxdynld: "/lib/ld-linux.so.3", // 2 for OABI, 3 for EABI
Freebsddynld: "/usr/libexec/ld-elf.so.1", Freebsddynld: "/usr/libexec/ld-elf.so.1",
......
src/cmd/link/internal/arm64/asm.go
View file @ 5fe9bbcf
...@@ -93,7 +93,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -93,7 +93,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Vput(uint64(sectoff)) ctxt.Out.Write64(uint64(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -102,38 +102,38 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -102,38 +102,38 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
case objabi.R_ADDR: case objabi.R_ADDR:
switch r.Siz { switch r.Siz {
case 4: case 4:
ld.Thearch.Vput(ld.R_AARCH64_ABS32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_ABS32 | uint64(elfsym)<<32)
case 8: case 8:
ld.Thearch.Vput(ld.R_AARCH64_ABS64 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_ABS64 | uint64(elfsym)<<32)
default: default:
return false return false
} }
case objabi.R_ADDRARM64: case objabi.R_ADDRARM64:
// two relocations: R_AARCH64_ADR_PREL_PG_HI21 and R_AARCH64_ADD_ABS_LO12_NC // two relocations: R_AARCH64_ADR_PREL_PG_HI21 and R_AARCH64_ADD_ABS_LO12_NC
ld.Thearch.Vput(ld.R_AARCH64_ADR_PREL_PG_HI21 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_ADR_PREL_PG_HI21 | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_AARCH64_ADD_ABS_LO12_NC | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_ADD_ABS_LO12_NC | uint64(elfsym)<<32)
case objabi.R_ARM64_TLS_LE: case objabi.R_ARM64_TLS_LE:
ld.Thearch.Vput(ld.R_AARCH64_TLSLE_MOVW_TPREL_G0 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_TLSLE_MOVW_TPREL_G0 | uint64(elfsym)<<32)
case objabi.R_ARM64_TLS_IE: case objabi.R_ARM64_TLS_IE:
ld.Thearch.Vput(ld.R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21 | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC | uint64(elfsym)<<32)
case objabi.R_ARM64_GOTPCREL: case objabi.R_ARM64_GOTPCREL:
ld.Thearch.Vput(ld.R_AARCH64_ADR_GOT_PAGE | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_ADR_GOT_PAGE | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_AARCH64_LD64_GOT_LO12_NC | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_LD64_GOT_LO12_NC | uint64(elfsym)<<32)
case objabi.R_CALLARM64: case objabi.R_CALLARM64:
if r.Siz != 4 { if r.Siz != 4 {
return false return false
} }
ld.Thearch.Vput(ld.R_AARCH64_CALL26 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_AARCH64_CALL26 | uint64(elfsym)<<32)
} }
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
return true return true
} }
...@@ -143,7 +143,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -143,7 +143,7 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -184,14 +184,14 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -184,14 +184,14 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
// Two relocation entries: MACHO_ARM64_RELOC_PAGEOFF12 MACHO_ARM64_RELOC_PAGE21 // Two relocation entries: MACHO_ARM64_RELOC_PAGEOFF12 MACHO_ARM64_RELOC_PAGE21
// if r.Xadd is non-zero, add two MACHO_ARM64_RELOC_ADDEND. // if r.Xadd is non-zero, add two MACHO_ARM64_RELOC_ADDEND.
if r.Xadd != 0 { if r.Xadd != 0 {
ld.Thearch.Lput(uint32(sectoff + 4)) out.Write32(uint32(sectoff + 4))
ld.Thearch.Lput((ld.MACHO_ARM64_RELOC_ADDEND << 28) | (2 << 25) | uint32(r.Xadd&0xffffff)) out.Write32((ld.MACHO_ARM64_RELOC_ADDEND << 28) | (2 << 25) | uint32(r.Xadd&0xffffff))
} }
ld.Thearch.Lput(uint32(sectoff + 4)) out.Write32(uint32(sectoff + 4))
ld.Thearch.Lput(v | (ld.MACHO_ARM64_RELOC_PAGEOFF12 << 28) | (2 << 25)) out.Write32(v | (ld.MACHO_ARM64_RELOC_PAGEOFF12 << 28) | (2 << 25))
if r.Xadd != 0 { if r.Xadd != 0 {
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput((ld.MACHO_ARM64_RELOC_ADDEND << 28) | (2 << 25) | uint32(r.Xadd&0xffffff)) out.Write32((ld.MACHO_ARM64_RELOC_ADDEND << 28) | (2 << 25) | uint32(r.Xadd&0xffffff))
} }
v |= 1 << 24 // pc-relative bit v |= 1 << 24 // pc-relative bit
v |= ld.MACHO_ARM64_RELOC_PAGE21 << 28 v |= ld.MACHO_ARM64_RELOC_PAGE21 << 28
...@@ -210,8 +210,8 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -210,8 +210,8 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
v |= 3 << 25 v |= 3 << 25
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(v) out.Write32(v)
return true return true
} }
...@@ -382,10 +382,10 @@ func asmb(ctxt *ld.Link) { ...@@ -382,10 +382,10 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -393,14 +393,14 @@ func asmb(ctxt *ld.Link) { ...@@ -393,14 +393,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -408,10 +408,10 @@ func asmb(ctxt *ld.Link) { ...@@ -408,10 +408,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
machlink := uint32(0) machlink := uint32(0)
...@@ -443,7 +443,7 @@ func asmb(ctxt *ld.Link) { ...@@ -443,7 +443,7 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdwarf.Fileoff + uint64(ld.Rnd(int64(ld.Segdwarf.Filelen), int64(*ld.FlagRound))) + uint64(machlink)) symo = uint32(ld.Segdwarf.Fileoff + uint64(ld.Rnd(int64(ld.Segdwarf.Filelen), int64(*ld.FlagRound))) + uint64(machlink))
} }
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
...@@ -451,8 +451,8 @@ func asmb(ctxt *ld.Link) { ...@@ -451,8 +451,8 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
ld.Elfemitreloc(ctxt) ld.Elfemitreloc(ctxt)
...@@ -461,13 +461,13 @@ func asmb(ctxt *ld.Link) { ...@@ -461,13 +461,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
case objabi.Hdarwin: case objabi.Hdarwin:
...@@ -480,18 +480,18 @@ func asmb(ctxt *ld.Link) { ...@@ -480,18 +480,18 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan 9 */ case objabi.Hplan9: /* plan 9 */
ld.Thearch.Lput(0x647) /* magic */ ctxt.Out.Write32(0x647) /* magic */
ld.Thearch.Lput(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Thearch.Lput(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32(uint32(ld.Symsize)) /* nsyms */
ld.Thearch.Lput(uint32(ld.Entryvalue(ctxt))) /* va of entry */ ctxt.Out.Write32(uint32(ld.Entryvalue(ctxt))) /* va of entry */
ld.Thearch.Lput(0) ctxt.Out.Write32(0)
ld.Thearch.Lput(uint32(ld.Lcsize)) ctxt.Out.Write32(uint32(ld.Lcsize))
case objabi.Hlinux, case objabi.Hlinux,
objabi.Hfreebsd, objabi.Hfreebsd,
...@@ -504,7 +504,7 @@ func asmb(ctxt *ld.Link) { ...@@ -504,7 +504,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbmacho(ctxt) ld.Asmbmacho(ctxt)
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/arm64/obj.go
View file @ 5fe9bbcf
...@@ -56,12 +56,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -56,12 +56,6 @@ func Init() (*sys.Arch, ld.Arch) {
Elfsetupplt: elfsetupplt, Elfsetupplt: elfsetupplt,
Gentext: gentext, Gentext: gentext,
Machoreloc1: machoreloc1, Machoreloc1: machoreloc1,
Lput: ld.Lputl,
Wput: ld.Wputl,
Vput: ld.Vputl,
Append16: ld.Append16l,
Append32: ld.Append32l,
Append64: ld.Append64l,
Linuxdynld: "/lib/ld-linux-aarch64.so.1", Linuxdynld: "/lib/ld-linux-aarch64.so.1",
......
src/cmd/link/internal/ld/data.go
View file @ 5fe9bbcf
...@@ -849,7 +849,7 @@ func Codeblk(ctxt *Link, addr int64, size int64) { ...@@ -849,7 +849,7 @@ func Codeblk(ctxt *Link, addr int64, size int64) {
} }
func CodeblkPad(ctxt *Link, addr int64, size int64, pad []byte) { func CodeblkPad(ctxt *Link, addr int64, size int64, pad []byte) {
if *flagA { if *flagA {
ctxt.Logf("codeblk [%#x,%#x) at offset %#x\n", addr, addr+size, coutbuf.Offset()) ctxt.Logf("codeblk [%#x,%#x) at offset %#x\n", addr, addr+size, ctxt.Out.Offset())
} }
blk(ctxt, ctxt.Textp, addr, size, pad) blk(ctxt, ctxt.Textp, addr, size, pad)
...@@ -932,13 +932,13 @@ func blk(ctxt *Link, syms []*Symbol, addr, size int64, pad []byte) { ...@@ -932,13 +932,13 @@ func blk(ctxt *Link, syms []*Symbol, addr, size int64, pad []byte) {
errorexit() errorexit()
} }
if addr < s.Value { if addr < s.Value {
strnputPad("", int(s.Value-addr), pad) ctxt.Out.WriteStringPad("", int(s.Value-addr), pad)
addr = s.Value addr = s.Value
} }
Cwrite(s.P) ctxt.Out.Write(s.P)
addr += int64(len(s.P)) addr += int64(len(s.P))
if addr < s.Value+s.Size { if addr < s.Value+s.Size {
strnputPad("", int(s.Value+s.Size-addr), pad) ctxt.Out.WriteStringPad("", int(s.Value+s.Size-addr), pad)
addr = s.Value + s.Size addr = s.Value + s.Size
} }
if addr != s.Value+s.Size { if addr != s.Value+s.Size {
...@@ -951,14 +951,14 @@ func blk(ctxt *Link, syms []*Symbol, addr, size int64, pad []byte) { ...@@ -951,14 +951,14 @@ func blk(ctxt *Link, syms []*Symbol, addr, size int64, pad []byte) {
} }
if addr < eaddr { if addr < eaddr {
strnputPad("", int(eaddr-addr), pad) ctxt.Out.WriteStringPad("", int(eaddr-addr), pad)
} }
Cflush() ctxt.Out.Flush()
} }
func Datblk(ctxt *Link, addr int64, size int64) { func Datblk(ctxt *Link, addr int64, size int64) {
if *flagA { if *flagA {
ctxt.Logf("datblk [%#x,%#x) at offset %#x\n", addr, addr+size, coutbuf.Offset()) ctxt.Logf("datblk [%#x,%#x) at offset %#x\n", addr, addr+size, ctxt.Out.Offset())
} }
blk(ctxt, datap, addr, size, zeros[:]) blk(ctxt, datap, addr, size, zeros[:])
...@@ -1029,7 +1029,7 @@ func Datblk(ctxt *Link, addr int64, size int64) { ...@@ -1029,7 +1029,7 @@ func Datblk(ctxt *Link, addr int64, size int64) {
func Dwarfblk(ctxt *Link, addr int64, size int64) { func Dwarfblk(ctxt *Link, addr int64, size int64) {
if *flagA { if *flagA {
ctxt.Logf("dwarfblk [%#x,%#x) at offset %#x\n", addr, addr+size, coutbuf.Offset()) ctxt.Logf("dwarfblk [%#x,%#x) at offset %#x\n", addr, addr+size, ctxt.Out.Offset())
} }
blk(ctxt, dwarfp, addr, size, zeros[:]) blk(ctxt, dwarfp, addr, size, zeros[:])
...@@ -1037,31 +1037,6 @@ func Dwarfblk(ctxt *Link, addr int64, size int64) { ...@@ -1037,31 +1037,6 @@ func Dwarfblk(ctxt *Link, addr int64, size int64) {
var zeros [512]byte var zeros [512]byte
// strnput writes the first n bytes of s.
// If n is larger than len(s),
// it is padded with NUL bytes.
func strnput(s string, n int) {
strnputPad(s, n, zeros[:])
}
// strnput writes the first n bytes of s.
// If n is larger than len(s),
// it is padded with the bytes in pad (repeated as needed).
func strnputPad(s string, n int, pad []byte) {
if len(s) >= n {
Cwritestring(s[:n])
} else {
Cwritestring(s)
n -= len(s)
for n > len(pad) {
Cwrite(pad)
n -= len(pad)
}
Cwrite(pad[:n])
}
}
var strdata []*Symbol var strdata []*Symbol
func addstrdata1(ctxt *Link, arg string) { func addstrdata1(ctxt *Link, arg string) {
......
src/cmd/link/internal/ld/dwarf.go
View file @ 5fe9bbcf
...@@ -16,6 +16,7 @@ package ld ...@@ -16,6 +16,7 @@ package ld
import ( import (
"cmd/internal/dwarf" "cmd/internal/dwarf"
"cmd/internal/objabi" "cmd/internal/objabi"
"cmd/internal/sys"
"fmt" "fmt"
"log" "log"
"os" "os"
...@@ -1137,7 +1138,7 @@ const ( ...@@ -1137,7 +1138,7 @@ const (
) )
// appendPCDeltaCFA appends per-PC CFA deltas to b and returns the final slice. // appendPCDeltaCFA appends per-PC CFA deltas to b and returns the final slice.
func appendPCDeltaCFA(b []byte, deltapc, cfa int64) []byte { func appendPCDeltaCFA(arch *sys.Arch, b []byte, deltapc, cfa int64) []byte {
b = append(b, dwarf.DW_CFA_def_cfa_offset_sf) b = append(b, dwarf.DW_CFA_def_cfa_offset_sf)
b = dwarf.AppendSleb128(b, cfa/dataAlignmentFactor) b = dwarf.AppendSleb128(b, cfa/dataAlignmentFactor)
...@@ -1148,11 +1149,11 @@ func appendPCDeltaCFA(b []byte, deltapc, cfa int64) []byte { ...@@ -1148,11 +1149,11 @@ func appendPCDeltaCFA(b []byte, deltapc, cfa int64) []byte {
b = append(b, dwarf.DW_CFA_advance_loc1) b = append(b, dwarf.DW_CFA_advance_loc1)
b = append(b, uint8(deltapc)) b = append(b, uint8(deltapc))
case deltapc < 0x10000: case deltapc < 0x10000:
b = append(b, dwarf.DW_CFA_advance_loc2) b = append(b, dwarf.DW_CFA_advance_loc2, 0, 0)
b = Thearch.Append16(b, uint16(deltapc)) arch.ByteOrder.PutUint16(b[len(b)-2:], uint16(deltapc))
default: default:
b = append(b, dwarf.DW_CFA_advance_loc4) b = append(b, dwarf.DW_CFA_advance_loc4, 0, 0, 0, 0)
b = Thearch.Append32(b, uint32(deltapc)) arch.ByteOrder.PutUint32(b[len(b)-4:], uint32(deltapc))
} }
return b return b
} }
...@@ -1243,9 +1244,9 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol { ...@@ -1243,9 +1244,9 @@ func writeframes(ctxt *Link, syms []*Symbol) []*Symbol {
deltaBuf = append(deltaBuf, dwarf.DW_CFA_same_value) deltaBuf = append(deltaBuf, dwarf.DW_CFA_same_value)
deltaBuf = dwarf.AppendUleb128(deltaBuf, uint64(Thearch.Dwarfreglr)) deltaBuf = dwarf.AppendUleb128(deltaBuf, uint64(Thearch.Dwarfreglr))
} }
deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(pcsp.value)) deltaBuf = appendPCDeltaCFA(ctxt.Arch, deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(pcsp.value))
} else { } else {
deltaBuf = appendPCDeltaCFA(deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(ctxt.Arch.PtrSize)+int64(pcsp.value)) deltaBuf = appendPCDeltaCFA(ctxt.Arch, deltaBuf, int64(nextpc)-int64(pcsp.pc), int64(ctxt.Arch.PtrSize)+int64(pcsp.value))
} }
} }
pad := int(Rnd(int64(len(deltaBuf)), int64(ctxt.Arch.PtrSize))) - len(deltaBuf) pad := int(Rnd(int64(len(deltaBuf)), int64(ctxt.Arch.PtrSize))) - len(deltaBuf)
...@@ -1655,19 +1656,19 @@ func dwarfaddelfsectionsyms(ctxt *Link) { ...@@ -1655,19 +1656,19 @@ func dwarfaddelfsectionsyms(ctxt *Link) {
return return
} }
sym := ctxt.Syms.Lookup(".debug_info", 0) sym := ctxt.Syms.Lookup(".debug_info", 0)
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
sym = ctxt.Syms.Lookup(".debug_abbrev", 0) sym = ctxt.Syms.Lookup(".debug_abbrev", 0)
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
sym = ctxt.Syms.Lookup(".debug_line", 0) sym = ctxt.Syms.Lookup(".debug_line", 0)
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
sym = ctxt.Syms.Lookup(".debug_frame", 0) sym = ctxt.Syms.Lookup(".debug_frame", 0)
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
sym = ctxt.Syms.Lookup(".debug_loc", 0) sym = ctxt.Syms.Lookup(".debug_loc", 0)
if sym.Sect != nil { if sym.Sect != nil {
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
} }
sym = ctxt.Syms.Lookup(".debug_ranges", 0) sym = ctxt.Syms.Lookup(".debug_ranges", 0)
if sym.Sect != nil { if sym.Sect != nil {
putelfsectionsym(sym, sym.Sect.Elfsect.shnum) putelfsectionsym(ctxt.Out, sym, sym.Sect.Elfsect.shnum)
} }
} }
src/cmd/link/internal/ld/elf.go
View file @ 5fe9bbcf
This diff is collapsed.
src/cmd/link/internal/ld/lib.go
View file @ 5fe9bbcf
...@@ -105,14 +105,8 @@ type Arch struct { ...@@ -105,14 +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(*sys.Arch, *Symbol, *Reloc, int64) bool Machoreloc1 func(*sys.Arch, *OutBuf, *Symbol, *Reloc, int64) bool
PEreloc1 func(*sys.Arch, *Symbol, *Reloc, int64) bool PEreloc1 func(*sys.Arch, *OutBuf, *Symbol, *Reloc, int64) bool
Wput func(uint16)
Lput func(uint32)
Vput func(uint64)
Append16 func(b []byte, v uint16) []byte
Append32 func(b []byte, v uint32) []byte
Append64 func(b []byte, v uint64) []byte
// TLSIEtoLE converts a TLS Initial Executable relocation to // TLSIEtoLE converts a TLS Initial Executable relocation to
// a TLS Local Executable relocation. // a TLS Local Executable relocation.
...@@ -220,31 +214,6 @@ const ( ...@@ -220,31 +214,6 @@ const (
Pkgdef Pkgdef
) )
// TODO(dfc) outBuf duplicates bio.Writer
type outBuf struct {
w *bufio.Writer
f *os.File
off int64
}
func (w *outBuf) Write(p []byte) (n int, err error) {
n, err = w.w.Write(p)
w.off += int64(n)
return n, err
}
func (w *outBuf) WriteString(s string) (n int, err error) {
n, err = coutbuf.w.WriteString(s)
w.off += int64(n)
return n, err
}
func (w *outBuf) Offset() int64 {
return w.off
}
var coutbuf outBuf
const pkgdef = "__.PKGDEF" const pkgdef = "__.PKGDEF"
var ( var (
...@@ -297,8 +266,8 @@ func libinit(ctxt *Link) { ...@@ -297,8 +266,8 @@ func libinit(ctxt *Link) {
Exitf("cannot create %s: %v", *flagOutfile, err) Exitf("cannot create %s: %v", *flagOutfile, err)
} }
coutbuf.w = bufio.NewWriter(f) ctxt.Out.w = bufio.NewWriter(f)
coutbuf.f = f ctxt.Out.f = f
if *flagEntrySymbol == "" { if *flagEntrySymbol == "" {
switch Buildmode { switch Buildmode {
...@@ -315,23 +284,9 @@ func libinit(ctxt *Link) { ...@@ -315,23 +284,9 @@ func libinit(ctxt *Link) {
} }
func errorexit() { func errorexit() {
if coutbuf.f != nil {
if nerrors != 0 {
Cflush()
}
// For rmtemp run at atexit time on Windows.
if err := coutbuf.f.Close(); err != nil {
Exitf("close: %v", err)
}
}
if nerrors != 0 { if nerrors != 0 {
if coutbuf.f != nil {
mayberemoveoutfile()
}
Exit(2) Exit(2)
} }
Exit(0) Exit(0)
} }
...@@ -606,7 +561,7 @@ func (ctxt *Link) loadlib() { ...@@ -606,7 +561,7 @@ func (ctxt *Link) loadlib() {
} }
} }
} else { } else {
hostlinksetup() hostlinksetup(ctxt)
} }
// We've loaded all the code now. // We've loaded all the code now.
...@@ -934,7 +889,7 @@ func rmtemp() { ...@@ -934,7 +889,7 @@ func rmtemp() {
os.RemoveAll(*flagTmpdir) os.RemoveAll(*flagTmpdir)
} }
func hostlinksetup() { func hostlinksetup(ctxt *Link) {
if Linkmode != LinkExternal { if Linkmode != LinkExternal {
return return
} }
...@@ -956,7 +911,7 @@ func hostlinksetup() { ...@@ -956,7 +911,7 @@ func hostlinksetup() {
} }
// change our output to temporary object file // change our output to temporary object file
coutbuf.f.Close() ctxt.Out.f.Close()
mayberemoveoutfile() mayberemoveoutfile()
p := filepath.Join(*flagTmpdir, "go.o") p := filepath.Join(*flagTmpdir, "go.o")
...@@ -966,8 +921,9 @@ func hostlinksetup() { ...@@ -966,8 +921,9 @@ func hostlinksetup() {
Exitf("cannot create %s: %v", p, err) Exitf("cannot create %s: %v", p, err)
} }
coutbuf.w = bufio.NewWriter(f) ctxt.Out.w = bufio.NewWriter(f)
coutbuf.f = f ctxt.Out.f = f
ctxt.Out.off = 0
} }
// hostobjCopy creates a copy of the object files in hostobj in a // hostobjCopy creates a copy of the object files in hostobj in a
...@@ -1048,11 +1004,11 @@ func (ctxt *Link) archive() { ...@@ -1048,11 +1004,11 @@ func (ctxt *Link) archive() {
// Force the buffer to flush here so that external // Force the buffer to flush here so that external
// tools will see a complete file. // tools will see a complete file.
Cflush() ctxt.Out.Flush()
if err := coutbuf.f.Close(); err != nil { if err := ctxt.Out.f.Close(); err != nil {
Exitf("close: %v", err) Exitf("close: %v", err)
} }
coutbuf.f = nil ctxt.Out.f = nil
argv := []string{*flagExtar, "-q", "-c", "-s", *flagOutfile} argv := []string{*flagExtar, "-q", "-c", "-s", *flagOutfile}
argv = append(argv, filepath.Join(*flagTmpdir, "go.o")) argv = append(argv, filepath.Join(*flagTmpdir, "go.o"))
...@@ -1907,36 +1863,6 @@ func stkprint(ctxt *Link, ch *chain, limit int) { ...@@ -1907,36 +1863,6 @@ func stkprint(ctxt *Link, ch *chain, limit int) {
} }
} }
func Cflush() {
if err := coutbuf.w.Flush(); err != nil {
Exitf("flushing %s: %v", coutbuf.f.Name(), err)
}
}
func Cseek(p int64) {
if p == coutbuf.off {
return
}
Cflush()
if _, err := coutbuf.f.Seek(p, 0); err != nil {
Exitf("seeking in output [0, 1]: %v", err)
}
coutbuf.off = p
}
func Cwritestring(s string) {
coutbuf.WriteString(s)
}
func Cwrite(p []byte) {
coutbuf.Write(p)
}
func Cput(c uint8) {
coutbuf.w.WriteByte(c)
coutbuf.off++
}
func usage() { func usage() {
fmt.Fprintf(os.Stderr, "usage: link [options] main.o\n") fmt.Fprintf(os.Stderr, "usage: link [options] main.o\n")
objabi.Flagprint(2) objabi.Flagprint(2)
......
src/cmd/link/internal/ld/link.go
View file @ 5fe9bbcf
...@@ -212,6 +212,8 @@ type Shlib struct { ...@@ -212,6 +212,8 @@ type Shlib struct {
// Link holds the context for writing object code from a compiler // Link holds the context for writing object code from a compiler
// or for reading that input into the linker. // or for reading that input into the linker.
type Link struct { type Link struct {
Out *OutBuf
Syms *Symbols Syms *Symbols
Arch *sys.Arch Arch *sys.Arch
......
src/cmd/link/internal/ld/macho.go
View file @ 5fe9bbcf
...@@ -229,8 +229,8 @@ var dylib []string ...@@ -229,8 +229,8 @@ var dylib []string
var linkoff int64 var linkoff int64
func machowrite(arch *sys.Arch) int { func machowrite(arch *sys.Arch, out *OutBuf) int {
o1 := coutbuf.Offset() o1 := out.Offset()
loadsize := 4 * 4 * ndebug loadsize := 4 * 4 * ndebug
for i := 0; i < len(load); i++ { for i := 0; i < len(load); i++ {
...@@ -245,97 +245,97 @@ func machowrite(arch *sys.Arch) int { ...@@ -245,97 +245,97 @@ func machowrite(arch *sys.Arch) int {
} }
if arch.PtrSize == 8 { if arch.PtrSize == 8 {
Thearch.Lput(MH_MAGIC_64) out.Write32(MH_MAGIC_64)
} else { } else {
Thearch.Lput(MH_MAGIC) out.Write32(MH_MAGIC)
} }
Thearch.Lput(machohdr.cpu) out.Write32(machohdr.cpu)
Thearch.Lput(machohdr.subcpu) out.Write32(machohdr.subcpu)
if Linkmode == LinkExternal { if Linkmode == LinkExternal {
Thearch.Lput(MH_OBJECT) /* file type - mach object */ out.Write32(MH_OBJECT) /* file type - mach object */
} else { } else {
Thearch.Lput(MH_EXECUTE) /* file type - mach executable */ out.Write32(MH_EXECUTE) /* file type - mach executable */
} }
Thearch.Lput(uint32(len(load)) + uint32(nseg) + uint32(ndebug)) out.Write32(uint32(len(load)) + uint32(nseg) + uint32(ndebug))
Thearch.Lput(uint32(loadsize)) out.Write32(uint32(loadsize))
if nkind[SymKindUndef] == 0 { if nkind[SymKindUndef] == 0 {
Thearch.Lput(MH_NOUNDEFS) /* flags - no undefines */ out.Write32(MH_NOUNDEFS) /* flags - no undefines */
} else { } else {
Thearch.Lput(0) /* flags */ out.Write32(0) /* flags */
} }
if arch.PtrSize == 8 { if arch.PtrSize == 8 {
Thearch.Lput(0) /* reserved */ out.Write32(0) /* reserved */
} }
for i := 0; i < nseg; i++ { for i := 0; i < nseg; i++ {
s := &seg[i] s := &seg[i]
if arch.PtrSize == 8 { if arch.PtrSize == 8 {
Thearch.Lput(LC_SEGMENT_64) out.Write32(LC_SEGMENT_64)
Thearch.Lput(72 + 80*s.nsect) out.Write32(72 + 80*s.nsect)
strnput(s.name, 16) out.WriteStringN(s.name, 16)
Thearch.Vput(s.vaddr) out.Write64(s.vaddr)
Thearch.Vput(s.vsize) out.Write64(s.vsize)
Thearch.Vput(s.fileoffset) out.Write64(s.fileoffset)
Thearch.Vput(s.filesize) out.Write64(s.filesize)
Thearch.Lput(s.prot1) out.Write32(s.prot1)
Thearch.Lput(s.prot2) out.Write32(s.prot2)
Thearch.Lput(s.nsect) out.Write32(s.nsect)
Thearch.Lput(s.flag) out.Write32(s.flag)
} else { } else {
Thearch.Lput(LC_SEGMENT) out.Write32(LC_SEGMENT)
Thearch.Lput(56 + 68*s.nsect) out.Write32(56 + 68*s.nsect)
strnput(s.name, 16) out.WriteStringN(s.name, 16)
Thearch.Lput(uint32(s.vaddr)) out.Write32(uint32(s.vaddr))
Thearch.Lput(uint32(s.vsize)) out.Write32(uint32(s.vsize))
Thearch.Lput(uint32(s.fileoffset)) out.Write32(uint32(s.fileoffset))
Thearch.Lput(uint32(s.filesize)) out.Write32(uint32(s.filesize))
Thearch.Lput(s.prot1) out.Write32(s.prot1)
Thearch.Lput(s.prot2) out.Write32(s.prot2)
Thearch.Lput(s.nsect) out.Write32(s.nsect)
Thearch.Lput(s.flag) out.Write32(s.flag)
} }
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 arch.PtrSize == 8 { if arch.PtrSize == 8 {
strnput(t.name, 16) out.WriteStringN(t.name, 16)
strnput(t.segname, 16) out.WriteStringN(t.segname, 16)
Thearch.Vput(t.addr) out.Write64(t.addr)
Thearch.Vput(t.size) out.Write64(t.size)
Thearch.Lput(t.off) out.Write32(t.off)
Thearch.Lput(t.align) out.Write32(t.align)
Thearch.Lput(t.reloc) out.Write32(t.reloc)
Thearch.Lput(t.nreloc) out.Write32(t.nreloc)
Thearch.Lput(t.flag) out.Write32(t.flag)
Thearch.Lput(t.res1) /* reserved */ out.Write32(t.res1) /* reserved */
Thearch.Lput(t.res2) /* reserved */ out.Write32(t.res2) /* reserved */
Thearch.Lput(0) /* reserved */ out.Write32(0) /* reserved */
} else { } else {
strnput(t.name, 16) out.WriteStringN(t.name, 16)
strnput(t.segname, 16) out.WriteStringN(t.segname, 16)
Thearch.Lput(uint32(t.addr)) out.Write32(uint32(t.addr))
Thearch.Lput(uint32(t.size)) out.Write32(uint32(t.size))
Thearch.Lput(t.off) out.Write32(t.off)
Thearch.Lput(t.align) out.Write32(t.align)
Thearch.Lput(t.reloc) out.Write32(t.reloc)
Thearch.Lput(t.nreloc) out.Write32(t.nreloc)
Thearch.Lput(t.flag) out.Write32(t.flag)
Thearch.Lput(t.res1) /* reserved */ out.Write32(t.res1) /* reserved */
Thearch.Lput(t.res2) /* reserved */ out.Write32(t.res2) /* reserved */
} }
} }
} }
for i := 0; i < len(load); i++ { for i := 0; i < len(load); i++ {
l := &load[i] l := &load[i]
Thearch.Lput(l.type_) out.Write32(l.type_)
Thearch.Lput(4 * (uint32(len(l.data)) + 2)) out.Write32(4 * (uint32(len(l.data)) + 2))
for j := 0; j < len(l.data); j++ { for j := 0; j < len(l.data); j++ {
Thearch.Lput(l.data[j]) out.Write32(l.data[j])
} }
} }
return int(coutbuf.Offset() - o1) return int(out.Offset() - o1)
} }
func (ctxt *Link) domacho() { func (ctxt *Link) domacho() {
...@@ -641,7 +641,7 @@ func Asmbmacho(ctxt *Link) { ...@@ -641,7 +641,7 @@ func Asmbmacho(ctxt *Link) {
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(ctxt.Arch) a := machowrite(ctxt.Arch, ctxt.Out)
if int32(a) > HEADR { if int32(a) > HEADR {
Exitf("HEADR too small: %d > %d", a, HEADR) Exitf("HEADR too small: %d > %d", a, HEADR)
} }
...@@ -878,12 +878,12 @@ func Domacholink(ctxt *Link) int64 { ...@@ -878,12 +878,12 @@ func Domacholink(ctxt *Link) int64 {
if size > 0 { if size > 0 {
linkoff = Rnd(int64(uint64(HEADR)+Segtext.Length), int64(*FlagRound)) + Rnd(int64(Segdata.Filelen), int64(*FlagRound)) + Rnd(int64(Segdwarf.Filelen), int64(*FlagRound)) linkoff = Rnd(int64(uint64(HEADR)+Segtext.Length), int64(*FlagRound)) + Rnd(int64(Segdata.Filelen), int64(*FlagRound)) + Rnd(int64(Segdwarf.Filelen), int64(*FlagRound))
Cseek(linkoff) ctxt.Out.SeekSet(linkoff)
Cwrite(s1.P[:s1.Size]) ctxt.Out.Write(s1.P[:s1.Size])
Cwrite(s2.P[:s2.Size]) ctxt.Out.Write(s2.P[:s2.Size])
Cwrite(s3.P[:s3.Size]) ctxt.Out.Write(s3.P[:s3.Size])
Cwrite(s4.P[:s4.Size]) ctxt.Out.Write(s4.P[:s4.Size])
} }
return Rnd(int64(size), int64(*FlagRound)) return Rnd(int64(size), int64(*FlagRound))
...@@ -895,7 +895,7 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) { ...@@ -895,7 +895,7 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) {
return return
} }
sect.Reloff = uint64(coutbuf.Offset()) sect.Reloff = uint64(ctxt.Out.Offset())
for i, s := range syms { for i, s := range syms {
if !s.Attr.Reachable() { if !s.Attr.Reachable() {
continue continue
...@@ -926,18 +926,18 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) { ...@@ -926,18 +926,18 @@ func machorelocsect(ctxt *Link, sect *Section, syms []*Symbol) {
if !r.Xsym.Attr.Reachable() { if !r.Xsym.Attr.Reachable() {
Errorf(sym, "unreachable reloc %d (%s) target %v", r.Type, RelocName(ctxt.Arch, 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(ctxt.Arch, sym, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) { if !Thearch.Machoreloc1(ctxt.Arch, ctxt.Out, sym, r, int64(uint64(sym.Value+int64(r.Off))-sect.Vaddr)) {
Errorf(sym, "unsupported obj reloc %d (%s)/%d to %s", r.Type, RelocName(ctxt.Arch, 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)
} }
} }
} }
sect.Rellen = uint64(coutbuf.Offset()) - sect.Reloff sect.Rellen = uint64(ctxt.Out.Offset()) - sect.Reloff
} }
func Machoemitreloc(ctxt *Link) { func Machoemitreloc(ctxt *Link) {
for coutbuf.Offset()&7 != 0 { for ctxt.Out.Offset()&7 != 0 {
Cput(0) ctxt.Out.Write8(0)
} }
machorelocsect(ctxt, Segtext.Sections[0], ctxt.Textp) machorelocsect(ctxt, Segtext.Sections[0], ctxt.Textp)
......
src/cmd/link/internal/ld/outbuf.go 0 → 100644
View file @ 5fe9bbcf
// Copyright 2017 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package ld
import (
"bufio"
"cmd/internal/sys"
"encoding/binary"
"os"
)
// OutBuf is a buffered file writer.
//
// It is simlar to the Writer in cmd/internal/bio with a few small differences.
//
// First, it tracks the output architecture and uses it to provide
// endian helpers.
//
// Second, it provides a very cheap offset counter that doesn't require
// any system calls to read the value.
type OutBuf struct {
arch *sys.Arch
off int64
w *bufio.Writer
f *os.File
encbuf [8]byte // temp buffer used by WriteN methods
}
func (out *OutBuf) SeekSet(p int64) {
if p == out.off {
return
}
out.Flush()
if _, err := out.f.Seek(p, 0); err != nil {
Exitf("seeking to %d in %s: %v", p, out.f.Name(), err)
}
out.off = p
}
func (out *OutBuf) Offset() int64 {
return out.off
}
// Write writes the contents of v to the buffer.
//
// As Write is backed by a bufio.Writer, callers do not have
// to explicitly handle the returned error as long as Flush is
// eventually called.
func (out *OutBuf) Write(v []byte) (int, error) {
n, err := out.w.Write(v)
out.off += int64(n)
return n, err
}
func (out *OutBuf) Write8(v uint8) {
if err := out.w.WriteByte(v); err == nil {
out.off++
}
}
func (out *OutBuf) Write16(v uint16) {
out.arch.ByteOrder.PutUint16(out.encbuf[:], v)
out.Write(out.encbuf[:2])
}
func (out *OutBuf) Write32(v uint32) {
out.arch.ByteOrder.PutUint32(out.encbuf[:], v)
out.Write(out.encbuf[:4])
}
func (out *OutBuf) Write32b(v uint32) {
binary.BigEndian.PutUint32(out.encbuf[:], v)
out.Write(out.encbuf[:4])
}
func (out *OutBuf) Write64(v uint64) {
out.arch.ByteOrder.PutUint64(out.encbuf[:], v)
out.Write(out.encbuf[:8])
}
func (out *OutBuf) Write64b(v uint64) {
binary.BigEndian.PutUint64(out.encbuf[:], v)
out.Write(out.encbuf[:8])
}
func (out *OutBuf) WriteString(s string) {
n, _ := out.w.WriteString(s)
out.off += int64(n)
}
// WriteStringN writes the first n bytes of s.
// If n is larger than len(s) then it is padded with zero bytes.
func (out *OutBuf) WriteStringN(s string, n int) {
out.WriteStringPad(s, n, zeros[:])
}
// WriteStringPad writes the first n bytes of s.
// If n is larger than len(s) then it is padded with the bytes in pad (repeated as needed).
func (out *OutBuf) WriteStringPad(s string, n int, pad []byte) {
if len(s) >= n {
out.WriteString(s[:n])
} else {
out.WriteString(s)
n -= len(s)
for n > len(pad) {
out.Write(pad)
n -= len(pad)
}
out.Write(pad[:n])
}
}
func (out *OutBuf) Flush() {
if err := out.w.Flush(); err != nil {
Exitf("flushing %s: %v", out.f.Name(), err)
}
}
src/cmd/link/internal/ld/pe.go
View file @ 5fe9bbcf
This diff is collapsed.
src/cmd/link/internal/ld/sym.go
View file @ 5fe9bbcf
...@@ -47,6 +47,7 @@ func linknew(arch *sys.Arch) *Link { ...@@ -47,6 +47,7 @@ func linknew(arch *sys.Arch) *Link {
}, },
Allsym: make([]*Symbol, 0, 100000), Allsym: make([]*Symbol, 0, 100000),
}, },
Out: &OutBuf{arch: arch},
Arch: arch, Arch: arch,
LibraryByPkg: make(map[string]*Library), LibraryByPkg: make(map[string]*Library),
} }
...@@ -55,6 +56,13 @@ func linknew(arch *sys.Arch) *Link { ...@@ -55,6 +56,13 @@ func linknew(arch *sys.Arch) *Link {
log.Fatalf("invalid objabi.GOARCH %s (want %s)", objabi.GOARCH, arch.Name) log.Fatalf("invalid objabi.GOARCH %s (want %s)", objabi.GOARCH, arch.Name)
} }
AtExit(func() {
if nerrors > 0 && ctxt.Out.f != nil {
ctxt.Out.f.Close()
mayberemoveoutfile()
}
})
return ctxt return ctxt
} }
......
src/cmd/link/internal/ld/symtab.go
View file @ 5fe9bbcf
...@@ -52,22 +52,22 @@ func putelfstr(s string) int { ...@@ -52,22 +52,22 @@ func putelfstr(s string) int {
return off return off
} }
func putelfsyment(off int, addr int64, size int64, info int, shndx int, other int) { func putelfsyment(out *OutBuf, off int, addr int64, size int64, info int, shndx int, other int) {
if elf64 { if elf64 {
Thearch.Lput(uint32(off)) out.Write32(uint32(off))
Cput(uint8(info)) out.Write8(uint8(info))
Cput(uint8(other)) out.Write8(uint8(other))
Thearch.Wput(uint16(shndx)) out.Write16(uint16(shndx))
Thearch.Vput(uint64(addr)) out.Write64(uint64(addr))
Thearch.Vput(uint64(size)) out.Write64(uint64(size))
Symsize += ELF64SYMSIZE Symsize += ELF64SYMSIZE
} else { } else {
Thearch.Lput(uint32(off)) out.Write32(uint32(off))
Thearch.Lput(uint32(addr)) out.Write32(uint32(addr))
Thearch.Lput(uint32(size)) out.Write32(uint32(size))
Cput(uint8(info)) out.Write8(uint8(info))
Cput(uint8(other)) out.Write8(uint8(other))
Thearch.Wput(uint16(shndx)) out.Write16(uint16(shndx))
Symsize += ELF32SYMSIZE Symsize += ELF32SYMSIZE
} }
} }
...@@ -174,7 +174,7 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S ...@@ -174,7 +174,7 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S
// (*Symbol).ElfsymForReloc). This is approximately equivalent to the // (*Symbol).ElfsymForReloc). This is approximately equivalent to the
// ELF linker -Bsymbolic-functions option, but that is buggy on // ELF linker -Bsymbolic-functions option, but that is buggy on
// several platforms. // several platforms.
putelfsyment(putelfstr("local."+s), addr, size, STB_LOCAL<<4|typ&0xf, elfshnum, other) putelfsyment(ctxt.Out, putelfstr("local."+s), addr, size, STB_LOCAL<<4|typ&0xf, elfshnum, other)
x.LocalElfsym = int32(numelfsym) x.LocalElfsym = int32(numelfsym)
numelfsym++ numelfsym++
return return
...@@ -182,20 +182,20 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S ...@@ -182,20 +182,20 @@ func putelfsym(ctxt *Link, x *Symbol, s string, t SymbolType, addr int64, go_ *S
return return
} }
putelfsyment(putelfstr(s), addr, size, bind<<4|typ&0xf, elfshnum, other) putelfsyment(ctxt.Out, putelfstr(s), addr, size, bind<<4|typ&0xf, elfshnum, other)
x.Elfsym = int32(numelfsym) x.Elfsym = int32(numelfsym)
numelfsym++ numelfsym++
} }
func putelfsectionsym(s *Symbol, shndx int) { func putelfsectionsym(out *OutBuf, s *Symbol, shndx int) {
putelfsyment(0, 0, 0, STB_LOCAL<<4|STT_SECTION, shndx, 0) putelfsyment(out, 0, 0, 0, STB_LOCAL<<4|STT_SECTION, shndx, 0)
s.Elfsym = int32(numelfsym) s.Elfsym = int32(numelfsym)
numelfsym++ numelfsym++
} }
func Asmelfsym(ctxt *Link) { func Asmelfsym(ctxt *Link) {
// the first symbol entry is reserved // the first symbol entry is reserved
putelfsyment(0, 0, 0, STB_LOCAL<<4|STT_NOTYPE, 0, 0) putelfsyment(ctxt.Out, 0, 0, 0, STB_LOCAL<<4|STT_NOTYPE, 0, 0)
dwarfaddelfsectionsyms(ctxt) dwarfaddelfsectionsyms(ctxt)
...@@ -203,7 +203,7 @@ func Asmelfsym(ctxt *Link) { ...@@ -203,7 +203,7 @@ func Asmelfsym(ctxt *Link) {
// Avoid having the working directory inserted into the symbol table. // Avoid having the working directory inserted into the symbol table.
// It is added with a name to avoid problems with external linking // It is added with a name to avoid problems with external linking
// encountered on some versions of Solaris. See issue #14957. // encountered on some versions of Solaris. See issue #14957.
putelfsyment(putelfstr("go.go"), 0, 0, STB_LOCAL<<4|STT_FILE, SHN_ABS, 0) putelfsyment(ctxt.Out, putelfstr("go.go"), 0, 0, STB_LOCAL<<4|STT_FILE, SHN_ABS, 0)
numelfsym++ numelfsym++
elfbind = STB_LOCAL elfbind = STB_LOCAL
...@@ -226,15 +226,15 @@ func putplan9sym(ctxt *Link, x *Symbol, s string, typ SymbolType, addr int64, go ...@@ -226,15 +226,15 @@ 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 && ctxt.Arch.Family == sys.AMD64 && !Flag8 { if Headtype == objabi.Hplan9 && ctxt.Arch.Family == sys.AMD64 && !Flag8 {
Lputb(uint32(addr >> 32)) ctxt.Out.Write32b(uint32(addr >> 32))
l = 8 l = 8
} }
Lputb(uint32(addr)) ctxt.Out.Write32b(uint32(addr))
Cput(uint8(t + 0x80)) /* 0x80 is variable length */ ctxt.Out.Write8(uint8(t + 0x80)) /* 0x80 is variable length */
Cwritestring(s) ctxt.Out.WriteString(s)
Cput(0) ctxt.Out.Write8(0)
Symsize += int32(l) + 1 + int32(len(s)) + 1 Symsize += int32(l) + 1 + int32(len(s)) + 1
...@@ -249,40 +249,6 @@ func Asmplan9sym(ctxt *Link) { ...@@ -249,40 +249,6 @@ func Asmplan9sym(ctxt *Link) {
var symt *Symbol var symt *Symbol
var encbuf [10]byte
func Wputb(w uint16) { Cwrite(Append16b(encbuf[:0], w)) }
func Lputb(l uint32) { Cwrite(Append32b(encbuf[:0], l)) }
func Vputb(v uint64) { Cwrite(Append64b(encbuf[:0], v)) }
func Wputl(w uint16) { Cwrite(Append16l(encbuf[:0], w)) }
func Lputl(l uint32) { Cwrite(Append32l(encbuf[:0], l)) }
func Vputl(v uint64) { Cwrite(Append64l(encbuf[:0], v)) }
func Append16b(b []byte, v uint16) []byte {
return append(b, uint8(v>>8), uint8(v))
}
func Append16l(b []byte, v uint16) []byte {
return append(b, uint8(v), uint8(v>>8))
}
func Append32b(b []byte, v uint32) []byte {
return append(b, uint8(v>>24), uint8(v>>16), uint8(v>>8), uint8(v))
}
func Append32l(b []byte, v uint32) []byte {
return append(b, uint8(v), uint8(v>>8), uint8(v>>16), uint8(v>>24))
}
func Append64b(b []byte, v uint64) []byte {
return append(b, uint8(v>>56), uint8(v>>48), uint8(v>>40), uint8(v>>32),
uint8(v>>24), uint8(v>>16), uint8(v>>8), uint8(v))
}
func Append64l(b []byte, v uint64) []byte {
return append(b, uint8(v), uint8(v>>8), uint8(v>>16), uint8(v>>24),
uint8(v>>32), uint8(v>>40), uint8(v>>48), uint8(v>>56))
}
type byPkg []*Library type byPkg []*Library
func (libs byPkg) Len() int { func (libs byPkg) Len() int {
......
src/cmd/link/internal/ld/util.go
View file @ 5fe9bbcf
...@@ -92,10 +92,7 @@ func Exit(code int) { ...@@ -92,10 +92,7 @@ func Exit(code int) {
// Exitf logs an error message then calls Exit(2). // Exitf logs an error message then calls Exit(2).
func Exitf(format string, a ...interface{}) { func Exitf(format string, a ...interface{}) {
fmt.Fprintf(os.Stderr, os.Args[0]+": "+format+"\n", a...) fmt.Fprintf(os.Stderr, os.Args[0]+": "+format+"\n", a...)
if coutbuf.f != nil { nerrors++
coutbuf.f.Close()
mayberemoveoutfile()
}
Exit(2) Exit(2)
} }
......
src/cmd/link/internal/mips/asm.go
View file @ 5fe9bbcf
...@@ -48,7 +48,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -48,7 +48,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Lput(uint32(sectoff)) ctxt.Out.Write32(uint32(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -58,15 +58,15 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -58,15 +58,15 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
if r.Siz != 4 { if r.Siz != 4 {
return false return false
} }
ld.Thearch.Lput(ld.R_MIPS_32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_MIPS_32 | uint32(elfsym)<<8)
case objabi.R_ADDRMIPS: case objabi.R_ADDRMIPS:
ld.Thearch.Lput(ld.R_MIPS_LO16 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_MIPS_LO16 | uint32(elfsym)<<8)
case objabi.R_ADDRMIPSU: case objabi.R_ADDRMIPSU:
ld.Thearch.Lput(ld.R_MIPS_HI16 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_MIPS_HI16 | uint32(elfsym)<<8)
case objabi.R_ADDRMIPSTLS: case objabi.R_ADDRMIPSTLS:
ld.Thearch.Lput(ld.R_MIPS_TLS_TPREL_LO16 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_MIPS_TLS_TPREL_LO16 | uint32(elfsym)<<8)
case objabi.R_CALLMIPS, objabi.R_JMPMIPS: case objabi.R_CALLMIPS, objabi.R_JMPMIPS:
ld.Thearch.Lput(ld.R_MIPS_26 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_MIPS_26 | uint32(elfsym)<<8)
} }
return true return true
...@@ -76,7 +76,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -76,7 +76,7 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -175,10 +175,10 @@ func asmb(ctxt *ld.Link) { ...@@ -175,10 +175,10 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -187,7 +187,7 @@ func asmb(ctxt *ld.Link) { ...@@ -187,7 +187,7 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
...@@ -195,10 +195,10 @@ func asmb(ctxt *ld.Link) { ...@@ -195,10 +195,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
/* output symbol table */ /* output symbol table */
...@@ -216,13 +216,13 @@ func asmb(ctxt *ld.Link) { ...@@ -216,13 +216,13 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen) symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen)
symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound))) symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound)))
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) ctxt.Logf("%5.2f dwarf\n", ld.Cputime())
...@@ -237,7 +237,7 @@ func asmb(ctxt *ld.Link) { ...@@ -237,7 +237,7 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
ld.Errorf(nil, "unsupported operating system") ld.Errorf(nil, "unsupported operating system")
...@@ -245,7 +245,7 @@ func asmb(ctxt *ld.Link) { ...@@ -245,7 +245,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbelf(ctxt, int64(symo)) ld.Asmbelf(ctxt, int64(symo))
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/mips/obj.go
View file @ 5fe9bbcf
...@@ -69,22 +69,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -69,22 +69,6 @@ func Init() (*sys.Arch, ld.Arch) {
Solarisdynld: "XXX", Solarisdynld: "XXX",
} }
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
}
return arch, theArch return arch, theArch
} }
......
src/cmd/link/internal/mips64/asm.go
View file @ 5fe9bbcf
...@@ -55,36 +55,36 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -55,36 +55,36 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
// type uint8 // type uint8
// addend int64 // addend int64
ld.Thearch.Vput(uint64(sectoff)) ctxt.Out.Write64(uint64(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
ld.Thearch.Lput(uint32(elfsym)) ctxt.Out.Write32(uint32(elfsym))
ld.Cput(0) ctxt.Out.Write8(0)
ld.Cput(0) ctxt.Out.Write8(0)
ld.Cput(0) ctxt.Out.Write8(0)
switch r.Type { switch r.Type {
default: default:
return false return false
case objabi.R_ADDR: case objabi.R_ADDR:
switch r.Siz { switch r.Siz {
case 4: case 4:
ld.Cput(ld.R_MIPS_32) ctxt.Out.Write8(ld.R_MIPS_32)
case 8: case 8:
ld.Cput(ld.R_MIPS_64) ctxt.Out.Write8(ld.R_MIPS_64)
default: default:
return false return false
} }
case objabi.R_ADDRMIPS: case objabi.R_ADDRMIPS:
ld.Cput(ld.R_MIPS_LO16) ctxt.Out.Write8(ld.R_MIPS_LO16)
case objabi.R_ADDRMIPSU: case objabi.R_ADDRMIPSU:
ld.Cput(ld.R_MIPS_HI16) ctxt.Out.Write8(ld.R_MIPS_HI16)
case objabi.R_ADDRMIPSTLS: case objabi.R_ADDRMIPSTLS:
ld.Cput(ld.R_MIPS_TLS_TPREL_LO16) ctxt.Out.Write8(ld.R_MIPS_TLS_TPREL_LO16)
case objabi.R_CALLMIPS, case objabi.R_CALLMIPS,
objabi.R_JMPMIPS: objabi.R_JMPMIPS:
ld.Cput(ld.R_MIPS_26) ctxt.Out.Write8(ld.R_MIPS_26)
} }
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
return true return true
} }
...@@ -93,7 +93,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -93,7 +93,7 @@ func elfsetupplt(ctxt *ld.Link) {
return return
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -182,10 +182,10 @@ func asmb(ctxt *ld.Link) { ...@@ -182,10 +182,10 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -193,14 +193,14 @@ func asmb(ctxt *ld.Link) { ...@@ -193,14 +193,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -208,10 +208,10 @@ func asmb(ctxt *ld.Link) { ...@@ -208,10 +208,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
/* output symbol table */ /* output symbol table */
...@@ -235,7 +235,7 @@ func asmb(ctxt *ld.Link) { ...@@ -235,7 +235,7 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdata.Fileoff + ld.Segdata.Filelen) symo = uint32(ld.Segdata.Fileoff + ld.Segdata.Filelen)
} }
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
...@@ -243,8 +243,8 @@ func asmb(ctxt *ld.Link) { ...@@ -243,8 +243,8 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
ld.Elfemitreloc(ctxt) ld.Elfemitreloc(ctxt)
...@@ -253,13 +253,13 @@ func asmb(ctxt *ld.Link) { ...@@ -253,13 +253,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
} }
} }
...@@ -267,7 +267,7 @@ func asmb(ctxt *ld.Link) { ...@@ -267,7 +267,7 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan 9 */ case objabi.Hplan9: /* plan 9 */
...@@ -275,14 +275,14 @@ func asmb(ctxt *ld.Link) { ...@@ -275,14 +275,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Arch == sys.ArchMIPS64LE { if ctxt.Arch == sys.ArchMIPS64LE {
magic = uint32(4*26*26 + 7) magic = uint32(4*26*26 + 7)
} }
ld.Thearch.Lput(magic) /* magic */ ctxt.Out.Write32(magic) /* magic */
ld.Thearch.Lput(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Thearch.Lput(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32(uint32(ld.Symsize)) /* nsyms */
ld.Thearch.Lput(uint32(ld.Entryvalue(ctxt))) /* va of entry */ ctxt.Out.Write32(uint32(ld.Entryvalue(ctxt))) /* va of entry */
ld.Thearch.Lput(0) ctxt.Out.Write32(0)
ld.Thearch.Lput(uint32(ld.Lcsize)) ctxt.Out.Write32(uint32(ld.Lcsize))
case objabi.Hlinux, case objabi.Hlinux,
objabi.Hfreebsd, objabi.Hfreebsd,
...@@ -292,7 +292,7 @@ func asmb(ctxt *ld.Link) { ...@@ -292,7 +292,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbelf(ctxt, int64(symo)) ld.Asmbelf(ctxt, int64(symo))
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/mips64/obj.go
View file @ 5fe9bbcf
...@@ -66,21 +66,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -66,21 +66,6 @@ func Init() (*sys.Arch, ld.Arch) {
Dragonflydynld: "XXX", Dragonflydynld: "XXX",
Solarisdynld: "XXX", Solarisdynld: "XXX",
} }
if arch == sys.ArchMIPS64LE {
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
}
return arch, theArch return arch, theArch
} }
......
src/cmd/link/internal/ppc64/asm.go
View file @ 5fe9bbcf
...@@ -370,7 +370,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -370,7 +370,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Vput(uint64(sectoff)) ctxt.Out.Write64(uint64(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -379,60 +379,60 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -379,60 +379,60 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
case objabi.R_ADDR: case objabi.R_ADDR:
switch r.Siz { switch r.Siz {
case 4: case 4:
ld.Thearch.Vput(ld.R_PPC64_ADDR32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR32 | uint64(elfsym)<<32)
case 8: case 8:
ld.Thearch.Vput(ld.R_PPC64_ADDR64 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR64 | uint64(elfsym)<<32)
default: default:
return false return false
} }
case objabi.R_POWER_TLS: case objabi.R_POWER_TLS:
ld.Thearch.Vput(ld.R_PPC64_TLS | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TLS | uint64(elfsym)<<32)
case objabi.R_POWER_TLS_LE: case objabi.R_POWER_TLS_LE:
ld.Thearch.Vput(ld.R_PPC64_TPREL16 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TPREL16 | uint64(elfsym)<<32)
case objabi.R_POWER_TLS_IE: case objabi.R_POWER_TLS_IE:
ld.Thearch.Vput(ld.R_PPC64_GOT_TPREL16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_GOT_TPREL16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_GOT_TPREL16_LO_DS | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_GOT_TPREL16_LO_DS | uint64(elfsym)<<32)
case objabi.R_ADDRPOWER: case objabi.R_ADDRPOWER:
ld.Thearch.Vput(ld.R_PPC64_ADDR16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_ADDR16_LO | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR16_LO | uint64(elfsym)<<32)
case objabi.R_ADDRPOWER_DS: case objabi.R_ADDRPOWER_DS:
ld.Thearch.Vput(ld.R_PPC64_ADDR16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_ADDR16_LO_DS | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_ADDR16_LO_DS | uint64(elfsym)<<32)
case objabi.R_ADDRPOWER_GOT: case objabi.R_ADDRPOWER_GOT:
ld.Thearch.Vput(ld.R_PPC64_GOT16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_GOT16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_GOT16_LO_DS | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_GOT16_LO_DS | uint64(elfsym)<<32)
case objabi.R_ADDRPOWER_PCREL: case objabi.R_ADDRPOWER_PCREL:
ld.Thearch.Vput(ld.R_PPC64_REL16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_REL16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_REL16_LO | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_REL16_LO | uint64(elfsym)<<32)
r.Xadd += 4 r.Xadd += 4
case objabi.R_ADDRPOWER_TOCREL: case objabi.R_ADDRPOWER_TOCREL:
ld.Thearch.Vput(ld.R_PPC64_TOC16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TOC16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_TOC16_LO | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TOC16_LO | uint64(elfsym)<<32)
case objabi.R_ADDRPOWER_TOCREL_DS: case objabi.R_ADDRPOWER_TOCREL_DS:
ld.Thearch.Vput(ld.R_PPC64_TOC16_HA | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TOC16_HA | uint64(elfsym)<<32)
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
ld.Thearch.Vput(uint64(sectoff + 4)) ctxt.Out.Write64(uint64(sectoff + 4))
ld.Thearch.Vput(ld.R_PPC64_TOC16_LO_DS | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_TOC16_LO_DS | uint64(elfsym)<<32)
case objabi.R_CALLPOWER: case objabi.R_CALLPOWER:
if r.Siz != 4 { if r.Siz != 4 {
return false return false
} }
ld.Thearch.Vput(ld.R_PPC64_REL24 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_PPC64_REL24 | uint64(elfsym)<<32)
} }
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
return true return true
} }
...@@ -448,7 +448,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -448,7 +448,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -910,7 +910,7 @@ func asmb(ctxt *ld.Link) { ...@@ -910,7 +910,7 @@ func asmb(ctxt *ld.Link) {
} }
for _, sect := range ld.Segtext.Sections { for _, sect := range ld.Segtext.Sections {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
// Handle additional text sections with Codeblk // Handle additional text sections with Codeblk
if sect.Name == ".text" { if sect.Name == ".text" {
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
...@@ -923,14 +923,14 @@ func asmb(ctxt *ld.Link) { ...@@ -923,14 +923,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -938,10 +938,10 @@ func asmb(ctxt *ld.Link) { ...@@ -938,10 +938,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
/* output symbol table */ /* output symbol table */
...@@ -965,7 +965,7 @@ func asmb(ctxt *ld.Link) { ...@@ -965,7 +965,7 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdata.Fileoff + ld.Segdata.Filelen) symo = uint32(ld.Segdata.Fileoff + ld.Segdata.Filelen)
} }
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
...@@ -973,8 +973,8 @@ func asmb(ctxt *ld.Link) { ...@@ -973,8 +973,8 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
ld.Elfemitreloc(ctxt) ld.Elfemitreloc(ctxt)
...@@ -983,13 +983,13 @@ func asmb(ctxt *ld.Link) { ...@@ -983,13 +983,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
} }
} }
...@@ -997,18 +997,18 @@ func asmb(ctxt *ld.Link) { ...@@ -997,18 +997,18 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan 9 */ case objabi.Hplan9: /* plan 9 */
ld.Thearch.Lput(0x647) /* magic */ ctxt.Out.Write32(0x647) /* magic */
ld.Thearch.Lput(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Thearch.Lput(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Thearch.Lput(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32(uint32(ld.Symsize)) /* nsyms */
ld.Thearch.Lput(uint32(ld.Entryvalue(ctxt))) /* va of entry */ ctxt.Out.Write32(uint32(ld.Entryvalue(ctxt))) /* va of entry */
ld.Thearch.Lput(0) ctxt.Out.Write32(0)
ld.Thearch.Lput(uint32(ld.Lcsize)) ctxt.Out.Write32(uint32(ld.Lcsize))
case objabi.Hlinux, case objabi.Hlinux,
objabi.Hfreebsd, objabi.Hfreebsd,
...@@ -1018,7 +1018,7 @@ func asmb(ctxt *ld.Link) { ...@@ -1018,7 +1018,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbelf(ctxt, int64(symo)) ld.Asmbelf(ctxt, int64(symo))
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/ppc64/obj.go
View file @ 5fe9bbcf
...@@ -71,22 +71,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -71,22 +71,6 @@ func Init() (*sys.Arch, ld.Arch) {
Solarisdynld: "XXX", Solarisdynld: "XXX",
} }
if arch == sys.ArchPPC64LE {
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
}
return arch, theArch return arch, theArch
} }
......
src/cmd/link/internal/s390x/asm.go
View file @ 5fe9bbcf
...@@ -234,7 +234,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -234,7 +234,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Vput(uint64(sectoff)) ctxt.Out.Write64(uint64(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -246,30 +246,30 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -246,30 +246,30 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return false return false
case 4: case 4:
// WARNING - silently ignored by linker in ELF64 // WARNING - silently ignored by linker in ELF64
ld.Thearch.Vput(ld.R_390_TLS_LE32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_TLS_LE32 | uint64(elfsym)<<32)
case 8: case 8:
// WARNING - silently ignored by linker in ELF32 // WARNING - silently ignored by linker in ELF32
ld.Thearch.Vput(ld.R_390_TLS_LE64 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_TLS_LE64 | uint64(elfsym)<<32)
} }
case objabi.R_TLS_IE: case objabi.R_TLS_IE:
switch r.Siz { switch r.Siz {
default: default:
return false return false
case 4: case 4:
ld.Thearch.Vput(ld.R_390_TLS_IEENT | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_TLS_IEENT | uint64(elfsym)<<32)
} }
case objabi.R_ADDR: case objabi.R_ADDR:
switch r.Siz { switch r.Siz {
default: default:
return false return false
case 4: case 4:
ld.Thearch.Vput(ld.R_390_32 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_32 | uint64(elfsym)<<32)
case 8: case 8:
ld.Thearch.Vput(ld.R_390_64 | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_64 | uint64(elfsym)<<32)
} }
case objabi.R_GOTPCREL: case objabi.R_GOTPCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Vput(ld.R_390_GOTENT | uint64(elfsym)<<32) ctxt.Out.Write64(ld.R_390_GOTENT | uint64(elfsym)<<32)
} else { } else {
return false return false
} }
...@@ -320,10 +320,10 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -320,10 +320,10 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
if elfrel == ld.R_390_NONE { if elfrel == ld.R_390_NONE {
return false // unsupported size/dbl combination return false // unsupported size/dbl combination
} }
ld.Thearch.Vput(uint64(elfrel) | uint64(elfsym)<<32) ctxt.Out.Write64(uint64(elfrel) | uint64(elfsym)<<32)
} }
ld.Thearch.Vput(uint64(r.Xadd)) ctxt.Out.Write64(uint64(r.Xadd))
return true return true
} }
...@@ -377,7 +377,7 @@ func elfsetupplt(ctxt *ld.Link) { ...@@ -377,7 +377,7 @@ func elfsetupplt(ctxt *ld.Link) {
} }
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
...@@ -508,10 +508,10 @@ func asmb(ctxt *ld.Link) { ...@@ -508,10 +508,10 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Codeblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -519,14 +519,14 @@ func asmb(ctxt *ld.Link) { ...@@ -519,14 +519,14 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -534,10 +534,10 @@ func asmb(ctxt *ld.Link) { ...@@ -534,10 +534,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
/* output symbol table */ /* output symbol table */
...@@ -555,13 +555,13 @@ func asmb(ctxt *ld.Link) { ...@@ -555,13 +555,13 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen) symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen)
symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound))) symo = uint32(ld.Rnd(int64(symo), int64(*ld.FlagRound)))
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f dwarf\n", ld.Cputime()) ctxt.Logf("%5.2f dwarf\n", ld.Cputime())
...@@ -575,7 +575,7 @@ func asmb(ctxt *ld.Link) { ...@@ -575,7 +575,7 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f header\n", ld.Cputime()) ctxt.Logf("%5.2f header\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
ld.Errorf(nil, "unsupported operating system") ld.Errorf(nil, "unsupported operating system")
...@@ -583,7 +583,7 @@ func asmb(ctxt *ld.Link) { ...@@ -583,7 +583,7 @@ func asmb(ctxt *ld.Link) {
ld.Asmbelf(ctxt, int64(symo)) ld.Asmbelf(ctxt, int64(symo))
} }
ld.Cflush() ctxt.Out.Flush()
if *ld.FlagC { if *ld.FlagC {
fmt.Printf("textsize=%d\n", ld.Segtext.Filelen) fmt.Printf("textsize=%d\n", ld.Segtext.Filelen)
fmt.Printf("datsize=%d\n", ld.Segdata.Filelen) fmt.Printf("datsize=%d\n", ld.Segdata.Filelen)
......
src/cmd/link/internal/s390x/obj.go
View file @ 5fe9bbcf
...@@ -56,12 +56,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -56,12 +56,6 @@ func Init() (*sys.Arch, ld.Arch) {
Elfsetupplt: elfsetupplt, Elfsetupplt: elfsetupplt,
Gentext: gentext, Gentext: gentext,
Machoreloc1: machoreloc1, Machoreloc1: machoreloc1,
Lput: ld.Lputb,
Wput: ld.Wputb,
Vput: ld.Vputb,
Append16: ld.Append16b,
Append32: ld.Append32b,
Append64: ld.Append64b,
Linuxdynld: "/lib64/ld64.so.1", Linuxdynld: "/lib64/ld64.so.1",
......
src/cmd/link/internal/x86/asm.go
View file @ 5fe9bbcf
...@@ -342,7 +342,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool { ...@@ -342,7 +342,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
} }
func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
ld.Thearch.Lput(uint32(sectoff)) ctxt.Out.Write32(uint32(sectoff))
elfsym := r.Xsym.ElfsymForReloc() elfsym := r.Xsym.ElfsymForReloc()
switch r.Type { switch r.Type {
...@@ -350,16 +350,16 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -350,16 +350,16 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return false return false
case objabi.R_ADDR: case objabi.R_ADDR:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_386_32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_32 | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
case objabi.R_GOTPCREL: case objabi.R_GOTPCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_386_GOTPC) ctxt.Out.Write32(ld.R_386_GOTPC)
if r.Xsym.Name != "_GLOBAL_OFFSET_TABLE_" { if r.Xsym.Name != "_GLOBAL_OFFSET_TABLE_" {
ld.Thearch.Lput(uint32(sectoff)) ctxt.Out.Write32(uint32(sectoff))
ld.Thearch.Lput(ld.R_386_GOT32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_GOT32 | uint32(elfsym)<<8)
} }
} else { } else {
return false return false
...@@ -367,30 +367,30 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -367,30 +367,30 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
case objabi.R_CALL: case objabi.R_CALL:
if r.Siz == 4 { if r.Siz == 4 {
if r.Xsym.Type == ld.SDYNIMPORT { if r.Xsym.Type == ld.SDYNIMPORT {
ld.Thearch.Lput(ld.R_386_PLT32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_PLT32 | uint32(elfsym)<<8)
} else { } else {
ld.Thearch.Lput(ld.R_386_PC32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_PC32 | uint32(elfsym)<<8)
} }
} else { } else {
return false return false
} }
case objabi.R_PCREL: case objabi.R_PCREL:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_386_PC32 | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_PC32 | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
case objabi.R_TLS_LE: case objabi.R_TLS_LE:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_386_TLS_LE | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_TLS_LE | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
case objabi.R_TLS_IE: case objabi.R_TLS_IE:
if r.Siz == 4 { if r.Siz == 4 {
ld.Thearch.Lput(ld.R_386_GOTPC) ctxt.Out.Write32(ld.R_386_GOTPC)
ld.Thearch.Lput(uint32(sectoff)) ctxt.Out.Write32(uint32(sectoff))
ld.Thearch.Lput(ld.R_386_TLS_GOTIE | uint32(elfsym)<<8) ctxt.Out.Write32(ld.R_386_TLS_GOTIE | uint32(elfsym)<<8)
} else { } else {
return false return false
} }
...@@ -399,7 +399,7 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool { ...@@ -399,7 +399,7 @@ func elfreloc1(ctxt *ld.Link, r *ld.Reloc, sectoff int64) bool {
return true return true
} }
func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func machoreloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -444,12 +444,12 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool ...@@ -444,12 +444,12 @@ func machoreloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool
v |= 3 << 25 v |= 3 << 25
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(v) out.Write32(v)
return true return true
} }
func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { func pereloc1(arch *sys.Arch, out *ld.OutBuf, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
var v uint32 var v uint32
rs := r.Xsym rs := r.Xsym
...@@ -459,8 +459,8 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -459,8 +459,8 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
return false return false
} }
ld.Thearch.Lput(uint32(sectoff)) out.Write32(uint32(sectoff))
ld.Thearch.Lput(uint32(rs.Dynid)) out.Write32(uint32(rs.Dynid))
switch r.Type { switch r.Type {
default: default:
...@@ -477,7 +477,7 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool { ...@@ -477,7 +477,7 @@ func pereloc1(arch *sys.Arch, s *ld.Symbol, r *ld.Reloc, sectoff int64) bool {
v = ld.IMAGE_REL_I386_REL32 v = ld.IMAGE_REL_I386_REL32
} }
ld.Thearch.Wput(uint16(v)) out.Write16(uint16(v))
return true return true
} }
...@@ -621,11 +621,11 @@ func asmb(ctxt *ld.Link) { ...@@ -621,11 +621,11 @@ func asmb(ctxt *ld.Link) {
} }
sect := ld.Segtext.Sections[0] sect := ld.Segtext.Sections[0]
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
// 0xCC is INT $3 - breakpoint instruction // 0xCC is INT $3 - breakpoint instruction
ld.CodeblkPad(ctxt, int64(sect.Vaddr), int64(sect.Length), []byte{0xCC}) ld.CodeblkPad(ctxt, int64(sect.Vaddr), int64(sect.Length), []byte{0xCC})
for _, sect = range ld.Segtext.Sections[1:] { for _, sect = range ld.Segtext.Sections[1:] {
ld.Cseek(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff)) ctxt.Out.SeekSet(int64(sect.Vaddr - ld.Segtext.Vaddr + ld.Segtext.Fileoff))
ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length)) ld.Datblk(ctxt, int64(sect.Vaddr), int64(sect.Length))
} }
...@@ -634,14 +634,14 @@ func asmb(ctxt *ld.Link) { ...@@ -634,14 +634,14 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f rodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f rodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrodata.Vaddr), int64(ld.Segrodata.Filelen))
} }
if ld.Segrelrodata.Filelen > 0 { if ld.Segrelrodata.Filelen > 0 {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime()) ctxt.Logf("%5.2f relrodatblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segrelrodata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segrelrodata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen)) ld.Datblk(ctxt, int64(ld.Segrelrodata.Vaddr), int64(ld.Segrelrodata.Filelen))
} }
...@@ -649,10 +649,10 @@ func asmb(ctxt *ld.Link) { ...@@ -649,10 +649,10 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f datblk\n", ld.Cputime()) ctxt.Logf("%5.2f datblk\n", ld.Cputime())
} }
ld.Cseek(int64(ld.Segdata.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdata.Fileoff))
ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen)) ld.Datblk(ctxt, int64(ld.Segdata.Vaddr), int64(ld.Segdata.Filelen))
ld.Cseek(int64(ld.Segdwarf.Fileoff)) ctxt.Out.SeekSet(int64(ld.Segdwarf.Fileoff))
ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen)) ld.Dwarfblk(ctxt, int64(ld.Segdwarf.Vaddr), int64(ld.Segdwarf.Filelen))
machlink := uint32(0) machlink := uint32(0)
...@@ -687,7 +687,7 @@ func asmb(ctxt *ld.Link) { ...@@ -687,7 +687,7 @@ func asmb(ctxt *ld.Link) {
symo = uint32(ld.Rnd(int64(symo), ld.PEFILEALIGN)) symo = uint32(ld.Rnd(int64(symo), ld.PEFILEALIGN))
} }
ld.Cseek(int64(symo)) ctxt.Out.SeekSet(int64(symo))
switch ld.Headtype { switch ld.Headtype {
default: default:
if ld.Iself { if ld.Iself {
...@@ -695,8 +695,8 @@ func asmb(ctxt *ld.Link) { ...@@ -695,8 +695,8 @@ func asmb(ctxt *ld.Link) {
ctxt.Logf("%5.2f elfsym\n", ld.Cputime()) ctxt.Logf("%5.2f elfsym\n", ld.Cputime())
} }
ld.Asmelfsym(ctxt) ld.Asmelfsym(ctxt)
ld.Cflush() ctxt.Out.Flush()
ld.Cwrite(ld.Elfstrdat) ctxt.Out.Write(ld.Elfstrdat)
if ld.Linkmode == ld.LinkExternal { if ld.Linkmode == ld.LinkExternal {
ld.Elfemitreloc(ctxt) ld.Elfemitreloc(ctxt)
...@@ -705,13 +705,13 @@ func asmb(ctxt *ld.Link) { ...@@ -705,13 +705,13 @@ func asmb(ctxt *ld.Link) {
case objabi.Hplan9: case objabi.Hplan9:
ld.Asmplan9sym(ctxt) ld.Asmplan9sym(ctxt)
ld.Cflush() ctxt.Out.Flush()
sym := ctxt.Syms.Lookup("pclntab", 0) sym := ctxt.Syms.Lookup("pclntab", 0)
if sym != nil { if sym != nil {
ld.Lcsize = int32(len(sym.P)) ld.Lcsize = int32(len(sym.P))
ld.Cwrite(sym.P) ctxt.Out.Write(sym.P)
ld.Cflush() ctxt.Out.Flush()
} }
case objabi.Hwindows: case objabi.Hwindows:
...@@ -729,20 +729,20 @@ func asmb(ctxt *ld.Link) { ...@@ -729,20 +729,20 @@ func asmb(ctxt *ld.Link) {
if ctxt.Debugvlog != 0 { if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f headr\n", ld.Cputime()) ctxt.Logf("%5.2f headr\n", ld.Cputime())
} }
ld.Cseek(0) ctxt.Out.SeekSet(0)
switch ld.Headtype { switch ld.Headtype {
default: default:
case objabi.Hplan9: /* plan9 */ case objabi.Hplan9: /* plan9 */
magic := int32(4*11*11 + 7) magic := int32(4*11*11 + 7)
ld.Lputb(uint32(magic)) /* magic */ ctxt.Out.Write32b(uint32(magic)) /* magic */
ld.Lputb(uint32(ld.Segtext.Filelen)) /* sizes */ ctxt.Out.Write32b(uint32(ld.Segtext.Filelen)) /* sizes */
ld.Lputb(uint32(ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Segdata.Length - ld.Segdata.Filelen)) ctxt.Out.Write32b(uint32(ld.Segdata.Length - ld.Segdata.Filelen))
ld.Lputb(uint32(ld.Symsize)) /* nsyms */ ctxt.Out.Write32b(uint32(ld.Symsize)) /* nsyms */
ld.Lputb(uint32(ld.Entryvalue(ctxt))) /* va of entry */ ctxt.Out.Write32b(uint32(ld.Entryvalue(ctxt))) /* va of entry */
ld.Lputb(uint32(ld.Spsize)) /* sp offsets */ ctxt.Out.Write32b(uint32(ld.Spsize)) /* sp offsets */
ld.Lputb(uint32(ld.Lcsize)) /* line offsets */ ctxt.Out.Write32b(uint32(ld.Lcsize)) /* line offsets */
case objabi.Hdarwin: case objabi.Hdarwin:
ld.Asmbmacho(ctxt) ld.Asmbmacho(ctxt)
...@@ -758,5 +758,5 @@ func asmb(ctxt *ld.Link) { ...@@ -758,5 +758,5 @@ func asmb(ctxt *ld.Link) {
ld.Asmbpe(ctxt) ld.Asmbpe(ctxt)
} }
ld.Cflush() ctxt.Out.Flush()
} }
src/cmd/link/internal/x86/obj.go
View file @ 5fe9bbcf
...@@ -57,12 +57,6 @@ func Init() (*sys.Arch, ld.Arch) { ...@@ -57,12 +57,6 @@ func Init() (*sys.Arch, ld.Arch) {
Gentext: gentext, Gentext: gentext,
Machoreloc1: machoreloc1, Machoreloc1: machoreloc1,
PEreloc1: pereloc1, PEreloc1: pereloc1,
Lput: ld.Lputl,
Wput: ld.Wputl,
Vput: ld.Vputl,
Append16: ld.Append16l,
Append32: ld.Append32l,
Append64: ld.Append64l,
Linuxdynld: "/lib/ld-linux.so.2", Linuxdynld: "/lib/ld-linux.so.2",
Freebsddynld: "/usr/libexec/ld-elf.so.1", Freebsddynld: "/usr/libexec/ld-elf.so.1",
......
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