aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/internal/obj/obj.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-01-21 12:27:36 -0500
committerRuss Cox <rsc@golang.org>2015-01-21 19:06:31 +0000
commit24dfaba6d1dafffe55987ded672c73a9b6087e79 (patch)
tree73bddfb0127cfa8fab6a2161597018d2d1d4d6a1 /src/cmd/internal/obj/obj.go
parenta8e5e803e68c11fe812fa5d2d1ecefc0ffa73ef7 (diff)
downloadgo-24dfaba6d1dafffe55987ded672c73a9b6087e79.tar.xz
[dev.cc] cmd/internal/obj: reconvert from liblink
Using rsc.io/c2go repo revision 60c9302. - Export a few symbols needed by assemblers. - Implement Getgoroot etc directly, and add Getgoversion. - Removes dependency on Go 1.4 go/build. - Change magic history name <no name> to <pop> The <pop> change requires adjustment to the liblink serializer. Change-Id: If5fb52ac9e91d50805263070b3fc5cc05d8b7632 Reviewed-on: https://go-review.googlesource.com/3141 Reviewed-by: Ian Lance Taylor <iant@golang.org> Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/cmd/internal/obj/obj.go')
-rw-r--r--src/cmd/internal/obj/obj.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cmd/internal/obj/obj.go b/src/cmd/internal/obj/obj.go
index 23ecd57e5e..4d8d13c8ec 100644
--- a/src/cmd/internal/obj/obj.go
+++ b/src/cmd/internal/obj/obj.go
@@ -37,7 +37,7 @@ func linklinefmt(ctxt *Link, lno0 int, showAll, showFullPath bool) string {
if lno < h.Line {
break
}
- if h.Name != "<no name>" {
+ if h.Name != "<pop>" {
if h.Offset > 0 {
// #line directive
if n > 0 && n < int(HISTSZ) {
@@ -148,7 +148,7 @@ func linkgetline(ctxt *Link, line int32, f **LSym, l *int32) {
if lno < h.Line {
break
}
- if h.Name != "<no name>" {
+ if h.Name != "<pop>" {
if h.Offset > 0 {
// #line directive
if n > 0 && n < HISTSZ {
@@ -214,7 +214,7 @@ func linkgetline(ctxt *Link, line int32, f **LSym, l *int32) {
*l = lno
}
-func linklinehist(ctxt *Link, lineno int, f string, offset int) {
+func Linklinehist(ctxt *Link, lineno int, f string, offset int) {
var h *Hist
if false { // debug['f']
@@ -247,7 +247,7 @@ func linklinehist(ctxt *Link, lineno int, f string, offset int) {
ctxt.Ehist = h
}
-func linkprfile(ctxt *Link, line int) {
+func Linkprfile(ctxt *Link, line int) {
l := int32(line)
var i int
var n int
@@ -259,7 +259,7 @@ func linkprfile(ctxt *Link, line int) {
if l < h.Line {
break
}
- if h.Name != "<no name>" {
+ if h.Name != "<pop>" {
if h.Offset == 0 {
if n >= 0 && n < HISTSZ {
a[n] = *h
@@ -296,7 +296,7 @@ func linkprfile(ctxt *Link, line int) {
/*
* start a new Prog list.
*/
-func linknewplist(ctxt *Link) *Plist {
+func Linknewplist(ctxt *Link) *Plist {
var pl *Plist