diff options
| author | Clément Chigot <clement.chigot@atos.net> | 2022-03-01 09:29:37 +0100 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-03-04 10:19:50 -0800 |
| commit | 6be8281c16e14e8a06057a38c01d80e56c14fdb3 (patch) | |
| tree | efef0cbe3b3cf9561709064b72046b7ed34d4782 /libgo/go/runtime | |
| parent | 25587472ccd223c861fe77cfeca4ba33c3f6cd99 (diff) | |
| download | gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.zip gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.gz gcc-6be8281c16e14e8a06057a38c01d80e56c14fdb3.tar.bz2 | |
libgo: fix AIX build for the Go1.18 update
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635
Diffstat (limited to 'libgo/go/runtime')
| -rw-r--r-- | libgo/go/runtime/malloc.go | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os_aix.go | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/libgo/go/runtime/malloc.go b/libgo/go/runtime/malloc.go index e5ab8de..7c019ee 100644 --- a/libgo/go/runtime/malloc.go +++ b/libgo/go/runtime/malloc.go @@ -321,7 +321,7 @@ const ( // // On other platforms, the user address space is contiguous // and starts at 0, so no offset is necessary. - arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix + arenaBaseOffset = 0xffff800000000000*goarch.IsAmd64 + 0x0a00000000000000*goos.IsAix*goarch.IsPpc64 // A typed version of this constant that will make it into DWARF (for viewcore). arenaBaseOffsetUintptr = uintptr(arenaBaseOffset) diff --git a/libgo/go/runtime/os_aix.go b/libgo/go/runtime/os_aix.go index d43765a..943cd22 100644 --- a/libgo/go/runtime/os_aix.go +++ b/libgo/go/runtime/os_aix.go @@ -7,7 +7,6 @@ package runtime import ( - "internal/abi" "unsafe" ) |