From: Shenghou Ma <minux@golang.org>
Date: Tue, 24 Mar 2015 06:07:20 +0000 (-0400)
Subject: cmd/6g: fix build for nacl/amd64p32
X-Git-Tag: go1.5beta1~1440
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=89f4fd3fd0d1d3660520f3bbb3500f2df1821f71;p=gostls13.git

cmd/6g: fix build for nacl/amd64p32

Change-Id: I3de78f321c99f8f850a304f7d34c85d0fe254c0e
Signed-off-by: Shenghou Ma <minux@golang.org>
Reviewed-on: https://go-review.googlesource.com/7975
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/cmd/6g/galign.go b/src/cmd/6g/galign.go
index 8dab0369e3..a73ddc6475 100644
--- a/src/cmd/6g/galign.go
+++ b/src/cmd/6g/galign.go
@@ -65,7 +65,7 @@ func betypeinit() {
 
 func main() {
 	if obj.Getgoos() == "nacl" {
-		resvd = append(resvd, x86.REG_BP, x86.REG_SI)
+		resvd = append(resvd, x86.REG_BP, x86.REG_R15)
 	} else if obj.Framepointer_enabled != 0 {
 		resvd = append(resvd, x86.REG_BP)
 	}