From 6be8281c16e14e8a06057a38c01d80e56c14fdb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Chigot?= Date: Tue, 1 Mar 2022 09:29:37 +0100 Subject: libgo: fix AIX build for the Go1.18 update Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/388635 --- libgo/go/runtime/malloc.go | 2 +- libgo/go/runtime/os_aix.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'libgo/go/runtime') 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" ) -- cgit v1.1