Merge pull request opencontainers#4034 from AkihiroSuda/fix-goarm

script/lib.sh: set GOARM=5 for armel, GOARM=6 for armhf
lifubang · Sep 28, 2023 · ee45b9b · ee45b9b
2 parents 4d948b1 + 531e29e
commit ee45b9b
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/script/lib.sh b/script/lib.sh
@@ -45,12 +45,21 @@ function set_cross_vars() {
 	armel)
 		HOST=arm-${PLATFORM}eabi
 		GOARCH=arm
-		GOARM=6
+		GOARM=5
 		;;
 	armhf)
 		HOST=arm-${PLATFORM}eabihf
 		GOARCH=arm
-		GOARM=7
+		# "armhf" means ARMv7 for Debian, ARMv6 for Raspbian.
+		# ARMv6 is chosen here for compatibility.
+		#
+		# https://wiki.debian.org/RaspberryPi
+		#
+		# > Raspberry Pi OS builds a single image for all of the Raspberry families,
+		# > so you will get an armhf 32-bit, hard floating-point system, but built
+		# > for the ARMv6 ISA (with VFP2), unlike Debian's ARMv7 ISA (with VFP3)
+		# > port.
+		GOARM=6
 		;;
 	ppc64le)
 		HOST=powerpc64le-${PLATFORM}