diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-01-22 11:06:03 -0800 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-01-22 15:08:25 -0800 |
| commit | 9e16359ce8db7180264fd5f047ca137ead8356dd (patch) | |
| tree | 02851f2feba20fad52ede392fe4e43afc8f260ab | |
| parent | 26afdf5070625d7a51e7393f57611062700bfa3e (diff) | |
| download | gcc-9e16359ce8db7180264fd5f047ca137ead8356dd.zip gcc-9e16359ce8db7180264fd5f047ca137ead8356dd.tar.gz gcc-9e16359ce8db7180264fd5f047ca137ead8356dd.tar.bz2 | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/os3_solaris.go | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 544c6e6..a778a85 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -9ae2223f91c4ca642885b80d88eb0baf756acf94 +1d64b76f559c0969ee2a6eb8e0ac9d268713880c 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/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) { |