From: Russ Cox <rsc@golang.org>
Date: Tue, 3 Mar 2015 15:47:15 +0000 (-0500)
Subject: cmd/internal/ld: fix darwin/386
X-Git-Tag: go1.5beta1~1752
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=91e7ca588d07b8e04e9608c4436d2d701f6c59d0;p=gostls13.git

cmd/internal/ld: fix darwin/386

grind's goto inliner moved a continue and changed its meaning. Oops.

Change-Id: Ifa2d3e1427036a606a069f356cd9b586ef22ec84
Reviewed-on: https://go-review.googlesource.com/6610
Reviewed-by: Russ Cox <rsc@golang.org>
---

diff --git a/src/cmd/internal/ld/ldmacho.go b/src/cmd/internal/ld/ldmacho.go
index 58f065a306..14e9923325 100644
--- a/src/cmd/internal/ld/ldmacho.go
+++ b/src/cmd/internal/ld/ldmacho.go
@@ -719,6 +719,7 @@ func ldmacho(f *Biobuf, pkg string, length int64, pn string) {
 		}
 		r = make([]Reloc, sect.nreloc)
 		rpi = 0
+	Reloc:
 		for j = 0; uint32(j) < sect.nreloc; j++ {
 			rp = &r[rpi]
 			rel = &sect.rel[j]
@@ -806,7 +807,7 @@ func ldmacho(f *Biobuf, pkg string, length int64, pn string) {
 						// skip #1 of 2 rel; continue skips #2 of 2.
 						j++
 
-						continue
+						continue Reloc
 					}
 				}