From 786899a72afe02836c003c1414ca279090e7d637 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Wed, 21 Mar 2018 19:42:24 +0100 Subject: [PATCH] runtime: adjust GOARM floating point compatibility error message As pointed out by Josh Bleecher Snyder in CL 99780. The check is for GOARM > 6, so suggest to recompile with either GOARM=5 or GOARM=6. Change-Id: I6a97e87bdc17aa3932f5c8cb598bba85c3cf4be9 Reviewed-on: https://go-review.googlesource.com/101936 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Josh Bleecher Snyder --- src/runtime/os_freebsd_arm.go | 2 +- src/runtime/os_linux_arm.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/runtime/os_freebsd_arm.go b/src/runtime/os_freebsd_arm.go index f0d04244f37..d2dc26f0c4f 100644 --- a/src/runtime/os_freebsd_arm.go +++ b/src/runtime/os_freebsd_arm.go @@ -21,7 +21,7 @@ func checkgoarm() { } 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.\n") + print("this GOARM=", goarm, " binary. Recompile using GOARM=5 or GOARM=6.\n") exit(1) } diff --git a/src/runtime/os_linux_arm.go b/src/runtime/os_linux_arm.go index a0e2c081b90..14f1cfeaefb 100644 --- a/src/runtime/os_linux_arm.go +++ b/src/runtime/os_linux_arm.go @@ -33,7 +33,7 @@ func checkgoarm() { } 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.\n") + print("this GOARM=", goarm, " binary. Recompile using GOARM=5 or GOARM=6.\n") exit(1) } }