From d47db6951939a4f595ae66cef747a486f83e54af Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 7 Mar 2018 15:22:46 +0000
Subject: [PATCH]     runtime: push arena on AIX higher due to clashes

    Reviewed-on: https://go-review.googlesource.com/99117


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@258337 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/go/gofrontend/MERGE    | 2 +-
 libgo/go/runtime/malloc.go | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 26293e56fce..fd9823c9612 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-2a07cd31927ac943104f55d2b696e53e7cd073b3
+112623c89ee42b42bc748f12d9c704615634501b
 
 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 1405a54639c..c8d528474c5 100644
--- a/libgo/go/runtime/malloc.go
+++ b/libgo/go/runtime/malloc.go
@@ -308,9 +308,9 @@ func mallocinit() {
 				p = uintptr(i)<<40 | uintptrMask&(0x0040<<32)
 			case GOOS == "aix":
 				if i == 0 {
-					p = uintptrMask&(1<<32) | uintptrMask&(0xa0<<52)
+					p = uintptrMask&(1<<42) | uintptrMask&(0xa0<<52)
 				} else {
-					p = uintptr(i)<<32 | uintptrMask&(0x70<<52)
+					p = uintptr(i)<<42 | uintptrMask&(0x70<<52)
 				}
 			default:
 				p = uintptr(i)<<40 | uintptrMask&(0x00c0<<32)
-- 
2.11.4.GIT