diff mbox series

libgo patch committed: Correct reference to getsystemcgf

Message ID CAOyqgcUEiHk=8Rwo9kkA5WTqtoSRg+ejUm1BZKjm6cWSpDXKKA@mail.gmail.com
State New
Headers show
Series libgo patch committed: Correct reference to getsystemcgf | expand

Commit Message

Ian Lance Taylor Jan. 30, 2021, 12:12 a.m. UTC 
This libgo patch by Clément Chigot directly sets getsystemcfg as
//extern in internal/cpu instead of trying to use the runtime as in Go
toolchain.  Bootstrapped and ran Go testsuite on x86_64-pc-linux-gnu.
Committed to mainline.

Ian
7da2394fc591a3fb236190c8712f3960a4ee8e5f
diff mbox series

Patch

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
 }