runtime: push arena on AIX higher due to clashes

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

From-SVN: r258337

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 26293e56fce3ba2ff9f673f9d0620fb19731971a..fd9823c9612b124f0ac5ba733d69d13e45ca6a09 100644 (file)
--- 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 1405a54639c72c623effd989f2fc11d798b032f3..c8d528474c515edcddf22b712f409bedde5e7196 100644 (file)
--- 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)