aboutsummaryrefslogtreecommitdiff
path: root/libgo
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-03-07 15:22:46 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-03-07 15:22:46 +0000
commit123ba0918c9ba27eeba43c885854a553e2b8b6f7 (patch)
tree93f89fa694df342336ec869464cd172948b26400 /libgo
parent2dab5d909f20be950c35ab4767ba1e0b64cb6bbc (diff)
downloadgcc-123ba0918c9ba27eeba43c885854a553e2b8b6f7.zip
gcc-123ba0918c9ba27eeba43c885854a553e2b8b6f7.tar.gz
gcc-123ba0918c9ba27eeba43c885854a553e2b8b6f7.tar.bz2
runtime: push arena on AIX higher due to clashes
Reviewed-on: https://go-review.googlesource.com/99117 From-SVN: r258337
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 1405a54..c8d5284 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)