From: Shenghou Ma <minux@golang.org>
Date: Wed, 6 Aug 2014 06:07:31 +0000 (-0400)
Subject: undo CL 114420043 / b613f2acdf69
X-Git-Tag: go1.4beta1~928
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6503d400519c7c03cc2f65d68bf72c83ac69dae2;p=gostls13.git

undo CL 114420043 / b613f2acdf69

Broke freebsd/amd64 due to exposure of a latent bug.

««« original CL description
cmd/ld: fix operator precedence

LGTM=rsc
R=rsc, iant
CC=golang-codereviews
https://golang.org/cl/114420043
»»»

TBR=dfc
R=dave
CC=golang-codereviews
https://golang.org/cl/120630043
---

diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index 1511d0b513..96eadd479a 100644
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -145,7 +145,7 @@ relocsym(LSym *s)
 			diag("%s: invalid relocation %d+%d not in [%d,%d)", s->name, off, siz, 0, s->np);
 			continue;
 		}
-		if(r->sym != S && ((r->sym->type & SMASK) == 0 || (r->sym->type & SMASK) == SXREF)) {
+		if(r->sym != S && (r->sym->type & SMASK == 0 || r->sym->type & SMASK == SXREF)) {
 			diag("%s: not defined", r->sym->name);
 			continue;
 		}