From 2e5b06dc5fadca16d14574f4407cf7ea03d50c97 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 9 Feb 2022 06:21:59 +0200 Subject: [PATCH] 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 --- src/Makefile.defs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.defs b/src/Makefile.defs index 801a2e36..29ac5fcc 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)))) -- 2.30.2