From a9f76d03bbc791cb55e4e0658f23efd0103ea9b0 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Mon, 4 Jan 2021 12:43:25 -0800 Subject: [PATCH] internal/cpu: more build fixes for Go1.16beta1 release Some files were missing from the libgo copy of internal/cpu, because they used to only declare CacheLinePadSize which libgo gets from goarch.sh. Now they also declare doinit, so copy them over. Adjust cpu_other.go. Fix the amd64p32 build by adding a build constraint to cpu_no_name.go. Fixes PR go/98493 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/281472 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/internal/cpu/cpu_arm.go | 2 ++ libgo/go/internal/cpu/cpu_mips.go | 10 ++++++++++ libgo/go/internal/cpu/cpu_mips64x.go | 2 ++ libgo/go/internal/cpu/cpu_mipsle.go | 10 ++++++++++ libgo/go/internal/cpu/cpu_no_name.go | 1 + libgo/go/internal/cpu/cpu_other.go | 3 +++ libgo/go/internal/cpu/cpu_ppc64x.go | 23 +++++++++++++++++++++++ libgo/go/internal/cpu/cpu_wasm.go | 10 ++++++++++ libgo/go/internal/cpu/cpu_x86.go | 2 ++ 10 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 libgo/go/internal/cpu/cpu_mips.go create mode 100644 libgo/go/internal/cpu/cpu_mipsle.go create mode 100644 libgo/go/internal/cpu/cpu_ppc64x.go create mode 100644 libgo/go/internal/cpu/cpu_wasm.go diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f4c99756d25..c80f1cc1425 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -2b5bdd22b7ec2fc13ae0f644c781f64c1a209500 +5b075d039a20f32b9c2711ca67a3e52fba74f957 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_arm.go b/libgo/go/internal/cpu/cpu_arm.go index 7324e7b8151..06962cfc518 100644 --- a/libgo/go/internal/cpu/cpu_arm.go +++ b/libgo/go/internal/cpu/cpu_arm.go @@ -4,6 +4,8 @@ package cpu +// const CacheLinePadSize = 32 + // arm doesn't have a 'cpuid' equivalent, so we rely on HWCAP/HWCAP2. // These are initialized by archauxv() and should not be changed after they are // initialized. diff --git a/libgo/go/internal/cpu/cpu_mips.go b/libgo/go/internal/cpu/cpu_mips.go new file mode 100644 index 00000000000..48755b6d1ae --- /dev/null +++ b/libgo/go/internal/cpu/cpu_mips.go @@ -0,0 +1,10 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cpu + +// const CacheLinePadSize = 32 + +func doinit() { +} diff --git a/libgo/go/internal/cpu/cpu_mips64x.go b/libgo/go/internal/cpu/cpu_mips64x.go index af10a5071ea..58fbd3db93d 100644 --- a/libgo/go/internal/cpu/cpu_mips64x.go +++ b/libgo/go/internal/cpu/cpu_mips64x.go @@ -6,6 +6,8 @@ package cpu +// const CacheLinePadSize = 32 + // This is initialized by archauxv and should not be changed after it is // initialized. var HWCap uint diff --git a/libgo/go/internal/cpu/cpu_mipsle.go b/libgo/go/internal/cpu/cpu_mipsle.go new file mode 100644 index 00000000000..48755b6d1ae --- /dev/null +++ b/libgo/go/internal/cpu/cpu_mipsle.go @@ -0,0 +1,10 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cpu + +// const CacheLinePadSize = 32 + +func doinit() { +} diff --git a/libgo/go/internal/cpu/cpu_no_name.go b/libgo/go/internal/cpu/cpu_no_name.go index ce1c37a3c7c..f028a92c935 100644 --- a/libgo/go/internal/cpu/cpu_no_name.go +++ b/libgo/go/internal/cpu/cpu_no_name.go @@ -4,6 +4,7 @@ // +build !386 // +build !amd64 +// +build !amd64p32 package cpu diff --git a/libgo/go/internal/cpu/cpu_other.go b/libgo/go/internal/cpu/cpu_other.go index d0f1f2e2150..ba3c42ad569 100644 --- a/libgo/go/internal/cpu/cpu_other.go +++ b/libgo/go/internal/cpu/cpu_other.go @@ -7,6 +7,8 @@ // +build !amd64p32 // +build !arm // +build !arm64 +// +build !mips +// +build !mipsle // +build !mips64 // +build !mips64le // +build !ppc @@ -14,6 +16,7 @@ // +build !ppc64le // +build !riscv64 // +build !s390x +// +build !wasm package cpu diff --git a/libgo/go/internal/cpu/cpu_ppc64x.go b/libgo/go/internal/cpu/cpu_ppc64x.go new file mode 100644 index 00000000000..0a48f6a0a06 --- /dev/null +++ b/libgo/go/internal/cpu/cpu_ppc64x.go @@ -0,0 +1,23 @@ +// Copyright 2017 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// +build ppc ppc64 ppc64le + +package cpu + +// const CacheLinePadSize = 128 + +func doinit() { + options = []option{ + {Name: "darn", Feature: &PPC64.HasDARN}, + {Name: "scv", Feature: &PPC64.HasSCV}, + {Name: "power9", Feature: &PPC64.IsPOWER9}, + } + + osinit() +} + +func isSet(hwc uint, value uint) bool { + return hwc&value != 0 +} diff --git a/libgo/go/internal/cpu/cpu_wasm.go b/libgo/go/internal/cpu/cpu_wasm.go new file mode 100644 index 00000000000..c9ab4ca4eec --- /dev/null +++ b/libgo/go/internal/cpu/cpu_wasm.go @@ -0,0 +1,10 @@ +// Copyright 2018 The Go Authors. All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +package cpu + +// const CacheLinePadSize = 64 + +func doinit() { +} diff --git a/libgo/go/internal/cpu/cpu_x86.go b/libgo/go/internal/cpu/cpu_x86.go index 9aa5c3acd42..338d90992c5 100644 --- a/libgo/go/internal/cpu/cpu_x86.go +++ b/libgo/go/internal/cpu/cpu_x86.go @@ -6,6 +6,8 @@ package cpu +// const CacheLinePadSize = 64 + // cpuid is implemented in cpu_x86.s. func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32) -- 2.30.2