diff options
| author | Russ Cox <rsc@golang.org> | 2015-02-05 03:57:44 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-02-05 19:13:12 +0000 |
| commit | 1fc330d8fe0ce6cbc6fd1f47c1cf035119566fc7 (patch) | |
| tree | 5436d1070b778506897f77f44706f1f30f1d0980 /src/cmd/internal/obj/obj.go | |
| parent | 8db173b85e1a151b61b38a15c9a4c97beac74191 (diff) | |
| download | go-git-1fc330d8fe0ce6cbc6fd1f47c1cf035119566fc7.tar.gz | |
[dev.cc] cmd/internal/obj: reconvert from liblink
cmd/internal/obj reconverted using rsc.io/c2go rev 2a95256.
- Brings in new, more regular Prog, Addr definitions
- Add Prog* argument to oclass in liblink/asm[68].c, for c2go conversion.
- Update objwriter for change in TEXT size encoding.
- Merge 5a, 6a, 8a, 9a changes into new5a, new6a, new8a, new9a (by hand).
- Add +build ignore to cmd/asm/internal/{addr,arch,asm}, cmd/asm.
They need to be updated for the changes.
- Reenable verifyAsm in cmd/go.
- Reenable GOOBJ=2 mode by default in liblink.
All architectures build successfully again.
Change-Id: I2c845c5d365aa484b570476898171bee657b626d
Reviewed-on: https://go-review.googlesource.com/3963
Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/cmd/internal/obj/obj.go')
| -rw-r--r-- | src/cmd/internal/obj/obj.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/cmd/internal/obj/obj.go b/src/cmd/internal/obj/obj.go index 4d8d13c8ec..214d9cae8b 100644 --- a/src/cmd/internal/obj/obj.go +++ b/src/cmd/internal/obj/obj.go @@ -15,7 +15,7 @@ const ( NSYM = 50 ) -func linklinefmt(ctxt *Link, lno0 int, showAll, showFullPath bool) string { +func Linklinefmt(ctxt *Link, lno0 int, showAll, showFullPath bool) string { var a [HISTSZ]struct { incl *Hist idel int32 @@ -222,11 +222,9 @@ func Linklinehist(ctxt *Link, lineno int, f string, offset int) { if offset != 0 { fmt.Printf("%4d: %s (#line %d)\n", lineno, f, offset) } else { - fmt.Printf("%4d: %s\n", lineno, f) } } else { - fmt.Printf("%4d: <pop>\n", lineno) } } @@ -297,7 +295,6 @@ func Linkprfile(ctxt *Link, line int) { * start a new Prog list. */ func Linknewplist(ctxt *Link) *Plist { - var pl *Plist pl = new(Plist) @@ -305,7 +302,6 @@ func Linknewplist(ctxt *Link) *Plist { if ctxt.Plist == nil { ctxt.Plist = pl } else { - ctxt.Plast.Link = pl } ctxt.Plast = pl |