File: stop-setting-march-on-arm.patch

package info (click to toggle)
kamailio 6.0.3-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 70,352 kB
  • sloc: ansic: 859,131; xml: 203,387; sh: 9,555; makefile: 9,294; sql: 8,571; yacc: 4,121; python: 3,086; perl: 2,955; java: 449; cpp: 289; javascript: 270; php: 258; ruby: 248; awk: 27
file content (44 lines) | stat: -rw-r--r-- 1,743 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
From: Adrian Bunk <bunk@debian.org>
Date: Wed, 9 Feb 2022 06:21:59 +0200
Subject: 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.
---
 src/Makefile.defs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 438d70c..29744ed 100644
--- a/src/Makefile.defs
+++ b/src/Makefile.defs
@@ -1251,7 +1251,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
@@ -1299,7 +1299,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))))
@@ -1345,8 +1345,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))))