diff -ru go.orig/src/cmd/dist/unix.c go/src/cmd/dist/unix.c
--- go.orig/src/cmd/dist/unix.c	2015-09-23 04:37:36.000000000 +0000
+++ go/src/cmd/dist/unix.c	2019-05-01 06:29:36.850699517 +0000
@@ -708,6 +708,8 @@
 			gohostarch = "386";
 		else if(contains(u.machine, "arm"))
 			gohostarch = "arm";
+		else if(contains(u.machine, "aarch64"))
+			gohostarch = "arm";
 		else
 			fatal("unknown architecture: %s", u.machine);
 	}
