From f76f120324f449cff3fdaeb05effbe18162e0cf1 Mon Sep 17 00:00:00 2001
From: Russ Cox <rsc@golang.org>
Date: Tue, 9 Oct 2012 12:50:06 -0400
Subject: cmd/ld: use 64-bit alignment for large data and bss objects

Check for specific, important misalignment in garbage collector.
Not a complete fix for issue 599 but an important workaround.

Update #599.

R=golang-dev, iant, dvyukov
CC=golang-dev
https://golang.org/cl/6641049
---
 src/cmd/ld/data.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/cmd/ld/data.c')

diff --git a/src/cmd/ld/data.c b/src/cmd/ld/data.c
index 89eccd143c..4afe4b801c 100644
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -831,7 +831,9 @@ dosymtype(void)
 static int32
 alignsymsize(int32 s)
 {
-	if(s >= PtrSize)
+	if(s >= 8)
+		s = rnd(s, 8);
+	else if(s >= PtrSize)
 		s = rnd(s, PtrSize);
 	else if(s > 2)
 		s = rnd(s, 4);
@@ -1054,6 +1056,7 @@ dodata(void)
 		datsize += rnd(s->size, PtrSize);
 	}
 	sect->len = datsize - sect->vaddr;
+	datsize = rnd(datsize, PtrSize);
 
 	/* gcdata */
 	sect = addsection(&segtext, ".gcdata", 04);
-- 
cgit v1.3-5-g9baa