From f419b56354aee87c5173253e2d19cc51cc269f3c Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Thu, 22 Dec 2016 18:31:17 +0100 Subject: [PATCH] runtime: skip floating point hardware check on Android CL 33652 removed the fake auxv for Android, and replaced it with a /proc/self/auxv fallback. When /proc/self/auxv is unreadable, however, hardware capabilities detection won't work and the runtime will mistakenly think that floating point hardware is unavailable. Fix this by always assuming floating point hardware on Android. Manually tested on a Nexus 5 running Android 6.0.1. I suspect the android/arm builder has a readable /proc/self/auxv and therefore does not trigger the failure mode. Change-Id: I95c3873803f9e17333c6cb8b9ff2016723104085 Reviewed-on: https://go-review.googlesource.com/34641 Reviewed-by: Brad Fitzpatrick Reviewed-by: Minux Ma Run-TryBot: Elias Naur TryBot-Result: Gobot Gobot --- src/runtime/os_linux_arm.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/runtime/os_linux_arm.go b/src/runtime/os_linux_arm.go index 2b0834a5aa9dd5..896ec15e6a8354 100644 --- a/src/runtime/os_linux_arm.go +++ b/src/runtime/os_linux_arm.go @@ -18,6 +18,12 @@ var armArch uint8 = 6 // we default to ARMv6 var hwcap uint32 // set by setup_auxv 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")