Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/internal/obj, cmd/link: remove Hwindowsgui everywhere

Browse source 
Hwindowsgui has the same meaning as Hwindows - build PE
executable. So use Hwindows everywhere.

Change-Id: I2cae5777f17c7bc3a043dfcd014c1620cc35fc20
Reviewed-on: https://go-review.googlesource.com/38761
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Alex Brainman 2017-03-29 15:14:55 +11:00
parent 4e3a1e409a
commit 361af94d5d
11 changed files with 33 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/link/internal/x86/asm.go
View file

@ -336,7 +336,7 @@ func adddynrel(ctxt *ld.Link, s *ld.Symbol, r *ld.Reloc) bool {
return true
}
if (ld.Headtype == obj.Hwindows || ld.Headtype == obj.Hwindowsgui) && s.Size == int64(ld.SysArch.PtrSize) {
if ld.Headtype == obj.Hwindows && s.Size == int64(ld.SysArch.PtrSize) {
// nothing to do, the relocation will be laid out in pereloc1
return true
}
@ -699,7 +699,7 @@ func asmb(ctxt *ld.Link) {
case obj.Hdarwin:
symo = uint32(ld.Segdwarf.Fileoff + uint64(ld.Rnd(int64(ld.Segdwarf.Filelen), int64(*ld.FlagRound))) + uint64(machlink))
case obj.Hwindows, obj.Hwindowsgui:
case obj.Hwindows:
symo = uint32(ld.Segdwarf.Fileoff + ld.Segdwarf.Filelen)
symo = uint32(ld.Rnd(int64(symo), ld.PEFILEALIGN))
}
@ -734,7 +734,7 @@ func asmb(ctxt *ld.Link) {
ld.Cflush()
}
case obj.Hwindows, obj.Hwindowsgui:
case obj.Hwindows:
if ctxt.Debugvlog != 0 {
ctxt.Logf("%5.2f dwarf\n", obj.Cputime())
}
@ -774,7 +774,7 @@ func asmb(ctxt *ld.Link) {
obj.Hnacl:
ld.Asmbelf(ctxt, int64(symo))
case obj.Hwindows, obj.Hwindowsgui:
case obj.Hwindows:
ld.Asmbpe(ctxt)
}