diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-03-07 15:22:46 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2018-03-07 15:22:46 +0000 |
| commit | 123ba0918c9ba27eeba43c885854a553e2b8b6f7 (patch) | |
| tree | 93f89fa694df342336ec869464cd172948b26400 | |
| parent | 2dab5d909f20be950c35ab4767ba1e0b64cb6bbc (diff) | |
| download | gcc-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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 26293e5..fd9823c 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 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) |