From: Adrian Bunk <bunk@debian.org>
Date: Wed, 9 Feb 2022 04:21:59 +0000 (+0200)
Subject: Stop setting -march on arm
X-Git-Tag: archive/raspbian/5.7.2-1+rpi1^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3ef3aab27dec50631063552822947b1bc5ce5f5a;p=kamailio.git

Stop setting -march on arm

This broke the Debian armhf build due to the Debian gcc maintainer
changing the semantics of -march to disable FPU support unless +fp
is included.

Gbp-Pq: Name 0001-Stop-setting-march-on-arm.patch
---

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 92b80279..3919b62e 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -1261,7 +1261,7 @@ ifeq	($(ARCH), arm)
 ifeq		($(CC_NAME), gcc)
 				C_DEFS+=-DCC_GCC_LIKE_ASM
 				#common stuff
-				CFLAGS+=-marm -march=armv5t $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)
+				CFLAGS+=-marm $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)
 			#if gcc 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))
 					CFLAGS+= -ftree-vectorize -fno-strict-overflow
@@ -1309,7 +1309,7 @@ ifeq	($(ARCH), arm6)
 ifeq		($(CC_NAME), gcc)
 				C_DEFS+=-DCC_GCC_LIKE_ASM
 				#common stuff
-				CFLAGS+=-march=armv6 $(CC_OPT) -funroll-loops -fsigned-char \
+				CFLAGS+=-$(CC_OPT) -funroll-loops -fsigned-char \
 						$(PROFILE)
 			#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))
@@ -1355,8 +1355,8 @@ ifeq	($(ARCH), arm7)
 		# if gcc
 ifeq		($(CC_NAME), gcc)
 				C_DEFS+=-DCC_GCC_LIKE_ASM
-				#common stuff, use armv7-a as lowest common architecture
-				CFLAGS+=-march=armv7-a $(CC_OPT) -funroll-loops -fsigned-char \
+				#common stuff
+				CFLAGS+=-$(CC_OPT) -funroll-loops -fsigned-char \
 						$(PROFILE)
 			#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))