From: Benny Siegert <bsiegert@gmail.com>
Date: Wed, 21 May 2014 13:18:45 +0000 (-0700)
Subject: cmd/ld: correctly compute note size on NetBSD.
X-Git-Tag: go1.3rc1~66
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=775719c6009289d76ee181150b5772cc0699ebb7;p=gostls13.git

cmd/ld: correctly compute note size on NetBSD.

Patch from http://gnats.NetBSD.org/48811.

LGTM=iant
R=golang-codereviews, minux.ma, iant
CC=golang-codereviews, tk
https://golang.org/cl/94670047
---

diff --git a/src/cmd/ld/elf.c b/src/cmd/ld/elf.c
index 7859497594..0555cf46aa 100644
--- a/src/cmd/ld/elf.c
+++ b/src/cmd/ld/elf.c
@@ -388,7 +388,7 @@ elfnetbsdsig(ElfShdr *sh, uint64 startva, uint64 resoff)
 {
 	int n;
 
-	n = ELF_NOTE_NETBSD_NAMESZ + ELF_NOTE_NETBSD_DESCSZ + 1;
+	n = rnd(ELF_NOTE_NETBSD_NAMESZ, 4) + rnd(ELF_NOTE_NETBSD_DESCSZ, 4);
 	return elfnote(sh, startva, resoff, n);
 }