Skip to content

Commit

Permalink
fix building for arm arch below armv6 (gp2x, bittboy)
Browse files Browse the repository at this point in the history
  • Loading branch information
irixxxx committed Dec 29, 2020
1 parent 15eed40 commit 5ab80df
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5ab80df

Please sign in to comment.