runtime: remove checkgoarm function

    Nothing in libgo calls checkgoarm, and it relies on a variable, goarm,
    that is not set.

    Reviewed-on: https://go-review.googlesource.com/c/140057

From-SVN: r264872

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index c697cb697be77e98eafd2531a8235faf2f38e3b7..b28c8d333ef78e9e756a41041c929c70b92d9ebd 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bde5ac90e0b4efdf3e9a4d72af4eb23250608611
+9f4cf23e716bcf65e071260afa032a64acd3fdde
 
 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/os_linux_arm.go b/libgo/go/runtime/os_linux_arm.go
index 42c28393a96b9e54055f4c8191887424a54dd5b2..4b864558179500495a25ea01d7d675babea4e716 100644 (file)
--- a/libgo/go/runtime/os_linux_arm.go
+++ b/libgo/go/runtime/os_linux_arm.go
@@ -19,25 +19,6 @@ var armArch uint8 = 6 // we default to ARMv6
 var hwcap uint32      // set by archauxv
 var hardDiv bool      // set if a hardware divider is available
 
-func checkgoarm() {
-       // On Android, /proc/self/auxv might be unreadable and hwcap won't
-       // reflect the CPU capabilities. Assume that every Android arm device
-       // has the necessary floating point hardware available.
-       if GOOS == "android" {
-               return
-       }
-       if goarm > 5 && hwcap&_HWCAP_VFP == 0 {
-               print("runtime: this CPU has no floating point hardware, so it cannot run\n")
-               print("this GOARM=", goarm, " binary. Recompile using GOARM=5.\n")
-               exit(1)
-       }
-       if goarm > 6 && hwcap&_HWCAP_VFPv3 == 0 {
-               print("runtime: this CPU has no VFPv3 floating point hardware, so it cannot run\n")
-               print("this GOARM=", goarm, " binary. Recompile using GOARM=5 or GOARM=6.\n")
-               exit(1)
-       }
-}
-
 func archauxv(tag, val uintptr) {
        switch tag {
        case _AT_RANDOM: