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 stop-setting-march-on-arm.patch

diff --git a/src/Makefile.defs b/src/Makefile.defs
index 32e5693f8e4a4d18a02e45c904a102b9703f12d4..5519479b409a6279a07ec0def143ea39311959bd 100644 (file)
--- 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))))