aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShenghou Ma <minux@golang.org>2015-03-07 01:44:24 -0500
committerMinux Ma <minux@golang.org>2015-03-07 07:09:04 +0000
commitcbc854a7993accd581c3ad2a58cb51788372e29c (patch)
tree867a308f1f286e2ed640553b126fad85f8c83666 /src
parent3b00197017ad8ec903448fe203202602b0a466df (diff)
downloadgo-cbc854a7993accd581c3ad2a58cb51788372e29c.tar.xz
cmd/internal/obj/x86: fix nacl/amd64p32 build
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>
Diffstat (limited to 'src')
-rw-r--r--src/cmd/internal/obj/x86/obj6.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cmd/internal/obj/x86/obj6.go b/src/cmd/internal/obj/x86/obj6.go
index 57a201bd9a..2e47d9ad2c 100644
--- a/src/cmd/internal/obj/x86/obj6.go
+++ b/src/cmd/internal/obj/x86/obj6.go
@@ -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)
}