From: Dave Cheney <dave@cheney.net>
Date: Tue, 3 Mar 2015 21:54:16 +0000 (+1100)
Subject: cmd/internal/obj/ppc64: fix ppc64 build
X-Git-Tag: go1.5beta1~1738
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=cd277e28f26a916d9095fa839f5a8939be5d6b69;p=gostls13.git

cmd/internal/obj/ppc64: fix ppc64 build

Apply mask fix from 527b478 to ppc64.

Change-Id: Iac62228f0f04fa8b138e21d82786026158267aaf
Reviewed-on: https://go-review.googlesource.com/6582
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/cmd/internal/obj/ppc64/asm9.go b/src/cmd/internal/obj/ppc64/asm9.go
index 30d7d835f1..77ffec8dc3 100644
--- a/src/cmd/internal/obj/ppc64/asm9.go
+++ b/src/cmd/internal/obj/ppc64/asm9.go
@@ -905,17 +905,18 @@ func buildop(ctxt *obj.Link) {
 	}
 	sort.Sort(ocmp(optab[:n]))
 	for i := 0; i < n; i++ {
-		r0 := optab[i].as & obj.AMask
+		r := optab[i].as
+		r0 := r & obj.AMask
 		oprange[r0].start = optab[i:]
-		for optab[i].as&obj.AMask == r0 {
+		for optab[i].as == r {
 			i++
 		}
 		oprange[r0].stop = optab[i:]
 		i--
 
-		switch r0 {
+		switch r {
 		default:
-			ctxt.Diag("unknown op in build: %v", obj.Aconv(int(optab[i].as)))
+			ctxt.Diag("unknown op in build: %v", obj.Aconv(int(r)))
 			log.Fatalf("bad code")
 
 		case ADCBF: /* unary indexed: op (b+a); op (b) */