diff options
author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-22 00:06:44 +0000 |
---|---|---|
committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-22 00:06:44 +0000 |
commit | 3d338229dc6fa2092a17c0e175ddfb3514c085f4 (patch) | |
tree | 96dcda6cedb3e21eac2ce461a7b129b86f83feef /libgo/go/internal/cpu | |
parent | ea31c98daba7d3459dc5500049876fe0a71a89d3 (diff) | |
download | gcc-3d338229dc6fa2092a17c0e175ddfb3514c085f4.zip gcc-3d338229dc6fa2092a17c0e175ddfb3514c085f4.tar.gz gcc-3d338229dc6fa2092a17c0e175ddfb3514c085f4.tar.bz2 |
re PR go/88927 (Bootstrap failure on arm in libgo starting with r268084)
PR go/88927
runtime, internal/cpu: fix build for ARM GNU/Linux
Was failing with
../../../libgo/go/internal/cpu/cpu.go:138:2: error: reference to undefined name 'doinit'
138 | doinit()
| ^
Fix it by adding in Go 1.12 internal/cpu/cpu_arm.go, and the code in
runtime that initializes the values.
Fixes https://gcc.gnu.org/PR88927.
Reviewed-on: https://go-review.googlesource.com/c/158717
From-SVN: r268131
Diffstat (limited to 'libgo/go/internal/cpu')
-rw-r--r-- | libgo/go/internal/cpu/cpu_arm.go | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/libgo/go/internal/cpu/cpu_arm.go b/libgo/go/internal/cpu/cpu_arm.go new file mode 100644 index 0000000..a1d5a7b --- /dev/null +++ b/libgo/go/internal/cpu/cpu_arm.go @@ -0,0 +1,33 @@ +// 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 + +// arm doesn't have a 'cpuid' equivalent, so we rely on HWCAP/HWCAP2. +// These are linknamed in runtime/os_(linux|freebsd)_arm.go and are +// initialized by archauxv(). +// These should not be changed after they are initialized. +var HWCap uint +var HWCap2 uint + +// HWCAP/HWCAP2 bits. These are exposed by Linux and FreeBSD. +const ( + hwcap_VFPv4 = 1 << 16 + hwcap_IDIVA = 1 << 17 +) + +func doinit() { + options = []option{ + {Name: "vfpv4", Feature: &ARM.HasVFPv4}, + {Name: "idiva", Feature: &ARM.HasIDIVA}, + } + + // HWCAP feature bits + ARM.HasVFPv4 = isSet(HWCap, hwcap_VFPv4) + ARM.HasIDIVA = isSet(HWCap, hwcap_IDIVA) +} + +func isSet(hwc uint, value uint) bool { + return hwc&value != 0 +} |