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/link: move Headtype global to ctxt

Browse source 
For #22095

Change-Id: Idcfdfe8a94db8626392658bb93429454238f648a
Reviewed-on: https://go-review.googlesource.com/70835
Run-TryBot: David Crawshaw <crawshaw@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
David Crawshaw 2017-10-07 13:49:44 -04:00
parent 6fd1f825c1
commit 38cfeb9cb5
27 changed files with 145 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/cmd/link/internal/ld/main.go
View file

@ -85,7 +85,6 @@ var (
flagInterpreter = flag.String("I", "", "use `linker` as ELF dynamic linker")
FlagDebugTramp = flag.Int("debugtramp", 0, "debug trampolines")
flagHeadtype = flag.String("H", "", "set header `type`")
FlagRound = flag.Int("R", -1, "set address rounding `quantum`")
FlagTextAddr = flag.Int64("T", -1, "set text segment `address`")
FlagDataAddr = flag.Int64("D", -1, "set data segment `address`")
@ -115,6 +114,7 @@ func Main(arch *sys.Arch, theArch Arch) {
if ctxt.Arch.Family == sys.AMD64 && objabi.GOOS == "plan9" {
flag.BoolVar(&Flag8, "8", false, "use 64-bit addresses in symbol table")
}
flagHeadType := flag.String("H", "", "set header `type`")
flag.BoolVar(&ctxt.linkShared, "linkshared", false, "link against installed Go shared libraries")
flag.Var(&ctxt.LinkMode, "linkmode", "set link `mode`")
flag.Var(&ctxt.BuildMode, "buildmode", "set build `mode`")
@ -127,13 +127,13 @@ func Main(arch *sys.Arch, theArch Arch) {
objabi.Flagparse(usage)
switch *flagHeadtype {
switch *flagHeadType {
case "":
case "windowsgui":
Headtype = objabi.Hwindows
ctxt.HeadType = objabi.Hwindows
windowsgui = true
default:
if err := Headtype.Set(*flagHeadtype); err != nil {
if err := ctxt.HeadType.Set(*flagHeadType); err != nil {
Errorf(nil, "%v", err)
usage()
}
@ -150,7 +150,7 @@ func Main(arch *sys.Arch, theArch Arch) {
if *flagOutfile == "" {
*flagOutfile = "a.out"
if Headtype == objabi.Hwindows {
if ctxt.HeadType == objabi.Hwindows {
*flagOutfile += ".exe"
}
}
@ -159,8 +159,8 @@ func Main(arch *sys.Arch, theArch Arch) {
libinit(ctxt) // creates outfile
if Headtype == objabi.Hunknown {
Headtype.Set(objabi.GOOS)
if ctxt.HeadType == objabi.Hunknown {
ctxt.HeadType.Set(objabi.GOOS)
}
ctxt.computeTLSOffset()
@ -171,7 +171,7 @@ func Main(arch *sys.Arch, theArch Arch) {
}
if ctxt.Debugvlog != 0 {
ctxt.Logf("HEADER = -H%d -T0x%x -D0x%x -R0x%x\n", Headtype, uint64(*FlagTextAddr), uint64(*FlagDataAddr), uint32(*FlagRound))
ctxt.Logf("HEADER = -H%d -T0x%x -D0x%x -R0x%x\n", ctxt.HeadType, uint64(*FlagTextAddr), uint64(*FlagDataAddr), uint32(*FlagRound))
}
switch ctxt.BuildMode {
@ -202,11 +202,11 @@ func Main(arch *sys.Arch, theArch Arch) {
ctxt.callgraph()
ctxt.doelf()
if Headtype == objabi.Hdarwin {
if ctxt.HeadType == objabi.Hdarwin {
ctxt.domacho()
}
ctxt.dostkcheck()
if Headtype == objabi.Hwindows {
if ctxt.HeadType == objabi.Hwindows {
ctxt.dope()
}
ctxt.addexport()