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/ld/lib.go
View file

@ -431,7 +431,7 @@ func (ctxt *Link) loadlib() {
determineLinkMode(ctxt)
// Recalculate pe parameters now that we have Linkmode set.
if Headtype == obj.Hwindows || Headtype == obj.Hwindowsgui {
if Headtype == obj.Hwindows {
Peinit(ctxt)
}
@ -573,7 +573,7 @@ func (ctxt *Link) loadlib() {
if *flagLibGCC != "none" {
hostArchive(ctxt, *flagLibGCC)
}
if Headtype == obj.Hwindows || Headtype == obj.Hwindowsgui {
if Headtype == obj.Hwindows {
if p := ctxt.findLibPath("libmingwex.a"); p != "none" {
hostArchive(ctxt, p)
}
@ -1213,7 +1213,7 @@ func (l *Link) hostlink() {
}
}
}
if Headtype == obj.Hwindows || Headtype == obj.Hwindowsgui {
if Headtype == obj.Hwindows {
// libmingw32 and libmingwex have some inter-dependencies,
// so must use linker groups.
argv = append(argv, "-Wl,--start-group", "-lmingwex", "-lmingw32", "-Wl,--end-group")
@ -1954,7 +1954,7 @@ func genasmsym(ctxt *Link, put func(*Link, *Symbol, string, SymbolType, int64, *
put(ctxt, nil, s.Name, FileSym, s.Value, nil)
case obj.SHOSTOBJ:
if Headtype == obj.Hwindows || Headtype == obj.Hwindowsgui || Iself {
if Headtype == obj.Hwindows || Iself {
put(ctxt, s, s.Name, UndefinedSym, s.Value, nil)
}