From 4d31df4089987bb7fb85dd07c9d181dbee40ba87 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Chigot?= Date: Fri, 29 Jan 2021 16:27:39 +0100 Subject: [PATCH] internal/cpu: correctly link to getsystemcfg Directly set getsystemcfg as //extern in internal/cpu instead of trying to use the runtime as in Go toolchain. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/287932 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/internal/cpu/cpu_ppc64x_aix.go | 2 +- libgo/go/runtime/os_aix.go | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 366fcf02885..cb12c83a700 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2663206528a6d46cbde60dbccf84c8288707ab8d +271a043537f2f0ae93bde2cf4f4897e68a476ece 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/internal/cpu/cpu_ppc64x_aix.go b/libgo/go/internal/cpu/cpu_ppc64x_aix.go index a932684baf2..e2422a6ddaa 100644 --- a/libgo/go/internal/cpu/cpu_ppc64x_aix.go +++ b/libgo/go/internal/cpu/cpu_ppc64x_aix.go @@ -17,5 +17,5 @@ func osinit() { PPC64.IsPOWER9 = isSet(impl, _IMPL_POWER9) } -// getsystemcfg is defined in runtime/os2_aix.go +//extern getsystemcfg func getsystemcfg(label uint) uint diff --git a/libgo/go/runtime/os_aix.go b/libgo/go/runtime/os_aix.go index 630a1c22d7f..d902ae04dc9 100644 --- a/libgo/go/runtime/os_aix.go +++ b/libgo/go/runtime/os_aix.go @@ -13,9 +13,6 @@ import ( //extern sysconf func sysconf(int32) _C_long -//extern getsystemcfg -func getsystemcfg(int32) uint64 - type mOS struct { waitsema uintptr // semaphore for parking on locks } -- 2.30.2