From: kub Date: Tue, 29 Dec 2020 11:10:10 +0000 (+0100) Subject: fix building for arm arch below armv6 (gp2x, bittboy) X-Git-Tag: v2.00~625 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ab80df952c8de521f252a335e315df59cf25f0b;p=picodrive.git fix building for arm arch below armv6 (gp2x, bittboy) --- diff --git a/Makefile b/Makefile index 34f4824a..b38b3012 100644 --- a/Makefile +++ b/Makefile @@ -161,7 +161,6 @@ OBJS += platform/gp2x/warm.o USE_FRONTEND = 1 PLATFORM_MP3 = 1 PLATFORM_ZLIB = 1 -HAVE_ARMv6 = 0 endif ifeq "$(PLATFORM)" "libretro" OBJS += platform/libretro/libretro.o diff --git a/configure b/configure index 5bb6fcb1..a03ae886 100755 --- a/configure +++ b/configure @@ -430,6 +430,10 @@ fi if [ "$need_zlib" = "yes" ]; then echo "PLATFORM_ZLIB = 1" >> $config_mak fi +if [ "$ARCH" = "arm" -a "$have_armv6" != "yes" -a "$have_armv7" != "yes" ]; then + # pass info to cyclone not to use newer arm arch instructions + echo "HAVE_ARMv6 = 0" >> $config_mak +fi # GP2X toolchains are too old for UAL asm, # so add this here to not litter main Makefile