diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild
index 912f944f0d..84da57b77f 100644
--- a/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/go/go-9999.ebuild
@@ -62,9 +62,9 @@ go_arch()
 go_arm()
 {
 	case "${1:-${CHOST}}" in
-		armv5)	echo 5;;
-		armv6)	echo 6;;
-		armv7)	echo 7;;
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
 		*)
 			die "unknown GOARM for ${1:-${CHOST}}"
 			;;