From 3d338229dc6fa2092a17c0e175ddfb3514c085f4 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 22 Jan 2019 00:06:44 +0000
Subject: [PATCH] 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
---
 gcc/go/gofrontend/MERGE          |  2 +-
 libgo/go/internal/cpu/cpu_arm.go | 33 ++++++++++++++++++++++++++++++++
 libgo/go/runtime/os_linux_arm.go |  6 ++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 libgo/go/internal/cpu/cpu_arm.go

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8f423293d94..90a03eeaa5a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0c870ba6b3b43e0e56231f40c56b58dad0e36d9e
+fb44f62e7c01ebc987dad78875f593da18100007
 
 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
new file mode 100644
index 00000000000..a1d5a7ba255
--- /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
+}
diff --git a/libgo/go/runtime/os_linux_arm.go b/libgo/go/runtime/os_linux_arm.go
index 56c29f58a50..8de9d110934 100644
--- a/libgo/go/runtime/os_linux_arm.go
+++ b/libgo/go/runtime/os_linux_arm.go
@@ -4,6 +4,8 @@
 
 package runtime
 
+import "internal/cpu"
+
 var randomNumber uint32
 
 func archauxv(tag, val uintptr) {
@@ -14,5 +16,9 @@ func archauxv(tag, val uintptr) {
 		// it as a byte array.
 		randomNumber = uint32(startupRandomData[4]) | uint32(startupRandomData[5])<<8 |
 			uint32(startupRandomData[6])<<16 | uint32(startupRandomData[7])<<24
+	case _AT_HWCAP:
+		cpu.HWCap = uint(val)
+	case _AT_HWCAP2:
+		cpu.HWCap2 = uint(val)
 	}
 }
-- 
2.30.2