From: Russ Cox <rsc@golang.org>
Date: Fri, 24 Feb 2012 04:01:36 +0000 (-0500)
Subject: ld: fix alignment of rodata section
X-Git-Tag: weekly.2012-03-04~172
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=15d8b05f0ca604e40ba42a3e9f6d30b1a280d1d8;p=gostls13.git

ld: fix alignment of rodata section

We were not aligning the code size,
so read-only data, which follows in the same
segment, could be arbitrarily misaligned.

Fixes #2506.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/5693055
---

diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index 397ae83b23..786c10b64d 100644
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -1023,6 +1023,11 @@ textaddress(void)
 		}
 		va += sym->size;
 	}
+	
+	// Align end of code so that rodata starts aligned.
+	// 128 bytes is likely overkill but definitely cheap.
+	va = rnd(va, 128);
+
 	sect->len = va - sect->vaddr;
 }