From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Wed, 27 Feb 2019 15:51:49 +0000 (+0000)
Subject: runtime: align first persistentalloc chunk as requested
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b91dfdcc68b96c399c3815f7700f1803eea34972;p=gcc.git

runtime: align first persistentalloc chunk as requested

    Backport of upstream https://golang.org/cl/163859.

    This fixes various failures on 32-bit SPARC.

    Patch from Eric Boctazou.

    Reviewed-on: https://go-review.googlesource.com/c/163860

From-SVN: r269258
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 5b49264d0d9..b2f065d66a0 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bc036b3a03e089e78b892067e40dbb0e7ecca9e2
+c9581de3804f94c5a74ce14befce5c57368722b9
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/runtime/malloc.go b/libgo/go/runtime/malloc.go
index d2d869951c1..b6a7ee11e90 100644
--- a/libgo/go/runtime/malloc.go
+++ b/libgo/go/runtime/malloc.go
@@ -1269,7 +1269,7 @@ func persistentalloc1(size, align uintptr, sysStat *uint64) *notInHeap {
 				break
 			}
 		}
-		persistent.off = sys.PtrSize
+		persistent.off = round(sys.PtrSize, align)
 	}
 	p := persistent.base.add(persistent.off)
 	persistent.off += size