From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Mon, 24 Jun 2024 23:48:25 +0000 (+0000)
Subject: do not hard-code CPU target based on uname (Closes: #1009622).
X-Git-Tag: archive/raspbian/0.7.2-2+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2d61db4864af455e2727962e1c99fff16cf9e162;p=ck.git

do not hard-code CPU target based on uname (Closes: #1009622).

The compiler in Debian correctly targets the right ISA for the
architecture.  Hard-coding this can result in misbuilds depending on the
build machine.  Also, armv7-a is the wrong target for armhf now, it should
be armv7-a+fp.

Gbp-Pq: Topic debian
Gbp-Pq: Name 0001-ftbfs-armhf.patch
---

diff --git a/configure b/configure
index eb6719b..6b5d2b3 100755
--- a/configure
+++ b/configure
@@ -515,14 +515,6 @@ case $PLATFORM in
 		ENVIRONMENT=64
 		;;
 	arm|armv6|armv6l|armv7|armv7l)
-		case "$PLATFORM" in
-			"armv6"|"armv6l")
-				CFLAGS="$CFLAGS -march=armv6k";
-				;;
-			"armv7"|"armv7l")
-				CFLAGS="$CFLAGS -march=armv7-a";
-				;;
-		esac
 		RTM_ENABLE="CK_MD_RTM_DISABLE"
 		LSE_ENABLE="CK_MD_LSE_DISABLE"
 		MM="${MM:-"CK_MD_RMO"}"