diff options
| author | Clément Chigot <chigot.c@gmail.com> | 2020-06-09 11:36:01 +0200 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-06-12 16:30:53 -0700 |
| commit | 75452d68672ff7da6e5a167924b6aeb07b5b2ed1 (patch) | |
| tree | f5a4a8b9f48735f747aac1a450e7f6bbed650b4c /libgo/go | |
| parent | 309a6c468f394cf93837f5b3dcfb975206a98b92 (diff) | |
| download | gcc-75452d68672ff7da6e5a167924b6aeb07b5b2ed1.zip gcc-75452d68672ff7da6e5a167924b6aeb07b5b2ed1.tar.gz gcc-75452d68672ff7da6e5a167924b6aeb07b5b2ed1.tar.bz2 | |
runtime: fix arenaBaseOffset for aix/ppc
The arenaBaseOffset modifications was aimed only for aix/ppc64.
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/237038
Diffstat (limited to 'libgo/go')
| -rw-r--r-- | libgo/go/runtime/export_test.go | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/malloc.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libgo/go/runtime/export_test.go b/libgo/go/runtime/export_test.go index 6595faf..ab74e34 100644 --- a/libgo/go/runtime/export_test.go +++ b/libgo/go/runtime/export_test.go @@ -866,7 +866,7 @@ func FreePageAlloc(pp *PageAlloc) { // // This should not be higher than 0x100*pallocChunkBytes to support // mips and mipsle, which only have 31-bit address spaces. -var BaseChunkIdx = ChunkIdx(chunkIndex(((0xc000*pageAlloc64Bit + 0x100*pageAlloc32Bit) * pallocChunkBytes) + 0x0a00000000000000*sys.GoosAix)) +var BaseChunkIdx = ChunkIdx(chunkIndex(((0xc000*pageAlloc64Bit + 0x100*pageAlloc32Bit) * pallocChunkBytes) + 0x0a00000000000000*sys.GoosAix*sys.GoarchPpc64)) // PageBase returns an address given a chunk index and a page index // relative to that chunk. diff --git a/libgo/go/runtime/malloc.go b/libgo/go/runtime/malloc.go index 266f5eb..6df7eaa 100644 --- a/libgo/go/runtime/malloc.go +++ b/libgo/go/runtime/malloc.go @@ -312,7 +312,7 @@ const ( // // On other platforms, the user address space is contiguous // and starts at 0, so no offset is necessary. - arenaBaseOffset = sys.GoarchAmd64*(1<<47) + (^0x0a00000000000000+1)&uintptrMask*sys.GoosAix + arenaBaseOffset = sys.GoarchAmd64*(1<<47) + (^0x0a00000000000000+1)&uintptrMask*sys.GoosAix*sys.GoarchPpc64 // Max number of threads to run garbage collection. // 2, 3, and 4 are all plausible maximums depending |