aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McGrath <jimmc2@gmail.com>2010-10-11 14:39:41 -0400
committerRuss Cox <rsc@golang.org>2010-10-11 14:39:41 -0400
commit0f6926474f979f4ffd27b950fd0daf7603e17f29 (patch)
tree96d59781c192039b5bbfcf7321f79737da94397b
parente35aff7205038e1f763387b1587d6414630a3e9f (diff)
downloadgo-0f6926474f979f4ffd27b950fd0daf7603e17f29.tar.gz
go-0f6926474f979f4ffd27b950fd0daf7603e17f29.zip
6l: fix Mach-O LC_RPATH
Fixes #1177. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/2387042
-rw-r--r--src/cmd/ld/macho.c4
1 files changed, 4 insertions, 0 deletions
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;