aboutsummaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2018-03-07 15:22:46 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2018-03-07 15:22:46 +0000
commitd47db6951939a4f595ae66cef747a486f83e54af (patch)
tree93f89fa694df342336ec869464cd172948b26400 /libgo
parent139e57dc4ad46c8bdf142d607c1819f0727795a3 (diff)
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
Diffstat (limited to 'libgo')
-rw-r--r--libgo/go/runtime/malloc.go4
1 files changed, 2 insertions, 2 deletions
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)