Merge pull request #4013 from estesp/support-32bit-arm64

Support 32-bit userspace on 64-bit ARM cores
2020-02-14 11:48:05 -08:00
parent 7811aa7552 89de113de9
commit 27f25069c0
1 changed files with 6 additions and 1 deletions
--- a/platforms/cpuinfo.go
+++ b/platforms/cpuinfo.go
@@ -98,7 +98,12 @@ func getCPUVariant() string {

 	switch strings.ToLower(variant) {
 	case "8", "aarch64":
-		variant = "v8"
+		// special case: if running a 32-bit userspace on aarch64, the variant should be "v7"
+		if runtime.GOARCH == "arm" {
+			variant = "v7"
+		} else {
+			variant = "v8"
+		}
 	case "7", "7m", "?(12)", "?(13)", "?(14)", "?(15)", "?(16)", "?(17)":
 		variant = "v7"
 	case "6", "6tej":