From 9e16359ce8db7180264fd5f047ca137ead8356dd Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Wed, 22 Jan 2020 11:06:03 -0800 Subject: runtime: for Solaris, add osinit, and drop duplicate getncpu Fixes a build breakage introduced in the 1.14beta1 upgrade. Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/215857 --- libgo/go/runtime/os3_solaris.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'libgo/go/runtime') diff --git a/libgo/go/runtime/os3_solaris.go b/libgo/go/runtime/os3_solaris.go index 001feed..b2fa1d3 100644 --- a/libgo/go/runtime/os3_solaris.go +++ b/libgo/go/runtime/os3_solaris.go @@ -17,12 +17,11 @@ func getPageSize() int32 //extern sysconf func sysconf(int32) _C_long -func getncpu() int32 { - n := int32(sysconf(__SC_NPROCESSORS_ONLN)) - if n < 1 { - return 1 +func osinit() { + ncpu = getncpu() + if physPageSize == 0 { + physPageSize = uintptr(getPageSize()) } - return n } func sysargs(argc int32, argv **byte) { -- cgit v1.1