From: Shenghou Ma <minux@golang.org>
Date: Sat, 7 Mar 2015 06:44:24 +0000 (-0500)
Subject: cmd/internal/obj/x86: fix nacl/amd64p32 build
X-Git-Tag: go1.5beta1~1662
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cbc854a7993accd581c3ad2a58cb51788372e29c;p=gostls13.git

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>
---

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)
 	}