Merge pull request #115 from docker-library/revert-114-marm

Revert "Add `-marm` to arm32v6 so it can be armv6-from-armv7-compiler instead…"
docker-library · Mar 19, 2024 · d21c6a0 · d21c6a0
2 parents 9421ae1 + cbaef89
commit d21c6a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile.build b/Dockerfile.build
@@ -70,8 +70,8 @@ RUN set -ex; \
 RUN set -ex; \
 	make clean all test \
 		TARGET_ARCH='arm32v6' \
-		CROSS_COMPILE='arm-linux-gnueabihf-' \
-		CFLAGS+='-marm -march=armv6+fp' \
+		CROSS_COMPILE='arm-linux-gnueabi-' \
+		CFLAGS+='-march=armv6+fp' \
 		ARCH_TEST='armhf'
 
 RUN set -ex; \

diff --git a/arm32v6/hello-world/hello b/arm32v6/hello-world/hello