[dev.cc] cmd/internal/obj/arm: add a couple of missing settings of Ctxt

Change-Id: Ic33431cdcc93db300fc2c3467eafdb5340ee4896
Reviewed-on: https://go-review.googlesource.com/4924
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/src/cmd/internal/obj/arm/asm5.go b/src/cmd/internal/obj/arm/asm5.go
index 54c84174e2896da7b681665bde33782b716bbc63..2e11ae3c1177b480f64fd4fcb7f3f9e72e12ee3c 100644 (file)
--- a/src/cmd/internal/obj/arm/asm5.go
+++ b/src/cmd/internal/obj/arm/asm5.go
@@ -865,6 +865,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) int {
                        q.Pcond = p.Link
                        q.Link = ctxt.Blitrl
                        q.Lineno = p.Lineno
+                       q.Ctxt = p.Ctxt
                        ctxt.Blitrl = q
                } else if !(force != 0) && (p.Pc+int64(12+pool.size)-int64(pool.start) < 2048) { // 12 take into account the maximum nacl literal pool alignment padding size
                        return 0
@@ -874,6 +875,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) int {
                        q = new(obj.Prog)
 
                        q.As = ADATABUNDLEEND
+                       q.Ctxt = p.Ctxt
                        ctxt.Elitrl.Link = q
                        ctxt.Elitrl = q
                }
@@ -909,6 +911,7 @@ func addpool(ctxt *obj.Link, p *obj.Prog, a *obj.Addr) {
 
        t = obj.Zprog
        t.As = AWORD
+       t.Ctxt = p.Ctxt
 
        switch c {
        default:
@@ -952,6 +955,7 @@ func addpool(ctxt *obj.Link, p *obj.Prog, a *obj.Addr) {
                *q = obj.Zprog
                q.As = ADATABUNDLE
                q.Pc = int64(pool.size)
+               q.Ctxt = p.Ctxt
                pool.size += 4
                if ctxt.Blitrl == nil {
                        ctxt.Blitrl = q

diff --git a/src/cmd/internal/obj/arm/obj5.go b/src/cmd/internal/obj/arm/obj5.go
index cd359a55dd4d856d494765805955d6df5429e547..292b232f7a65dd1ee6608ed85af35ae86a704514 100644 (file)
--- a/src/cmd/internal/obj/arm/obj5.go
+++ b/src/cmd/internal/obj/arm/obj5.go
@@ -1034,6 +1034,7 @@ loop:
                q.To.Type = obj.TYPE_BRANCH
                q.To.Offset = p.Pc
                q.Pcond = p
+               q.Ctxt = p.Ctxt
                p = q
        }