]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/internal/obj/x86: fix nacl/amd64p32 build
authorShenghou Ma <minux@golang.org>
Sat, 7 Mar 2015 06:44:24 +0000 (01:44 -0500)
committerMinux Ma <minux@golang.org>
Sat, 7 Mar 2015 07:09:04 +0000 (07:09 +0000)
some x86 instructions (e.g. PINSRW) might store memory address in Prog.From3,
so we must also rewrite Prog.From3 on nacl.

Change-Id: I2a0da0f692ba321eba17fbc454d68aaafa133515
Signed-off-by: Shenghou Ma <minux@golang.org>
Reviewed-on: https://go-review.googlesource.com/7074
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
src/cmd/internal/obj/x86/obj6.go

index 57a201bd9af589eff08a981e8e0c2084fadfa501..2e47d9ad2ce4c17b6f492ec3277605fdcf5d9eb5 100644 (file)
@@ -191,6 +191,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog) {
        }
 
        if ctxt.Headtype == obj.Hnacl && p.Mode == 64 {
+               nacladdr(ctxt, p, &p.From3)
                nacladdr(ctxt, p, &p.From)
                nacladdr(ctxt, p, &p.To)
        }