From: Jim McGrath <jimmc2@gmail.com>
Date: Mon, 11 Oct 2010 18:39:41 +0000 (-0400)
Subject: 6l: fix Mach-O LC_RPATH
X-Git-Tag: weekly.2010-10-13~33
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=0f6926474f979f4ffd27b950fd0daf7603e17f29;p=gostls13.git

6l: fix Mach-O LC_RPATH

Fixes #1177.

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/2387042
---

diff --git a/src/cmd/ld/macho.c b/src/cmd/ld/macho.c
index b3b1f8c497..63668a81dd 100644
--- a/src/cmd/ld/macho.c
+++ b/src/cmd/ld/macho.c
@@ -47,6 +47,10 @@ newMachoLoad(uint32 type, uint32 ndata)
 		diag("too many loads");
 		errorexit();
 	}
+	
+	if(macho64 && (ndata & 1))
+		ndata++;
+	
 	l = &load[nload++];
 	l->type = type;
 	l->ndata = ndata;