diff options
| author | Twinaphex | 2019-04-20 15:47:44 +0200 |
|---|---|---|
| committer | GitHub | 2019-04-20 15:47:44 +0200 |
| commit | 360664e28b0a695710b4191b2963d4f41f066519 (patch) | |
| tree | bd2a4774c3271a5f20d8023870f19ee6442cb8a3 | |
| parent | e1d8eb0f131f9e7e838ec5658345e51ebcc3179c (diff) | |
| parent | 4abd2871cc87171bf7e6ca8a3b42ade92e754402 (diff) | |
| download | pcsx_rearmed-360664e28b0a695710b4191b2963d4f41f066519.tar.gz pcsx_rearmed-360664e28b0a695710b4191b2963d4f41f066519.tar.bz2 pcsx_rearmed-360664e28b0a695710b4191b2963d4f41f066519.zip | |
Merge pull request #273 from hhromic/backport-marm
Backport check for Thumb instructions from configure script
| -rw-r--r-- | Makefile.libretro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Makefile.libretro b/Makefile.libretro index 5a59aea..2cda1d0 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -47,6 +47,12 @@ ifeq ($(platform), unix) ifneq ($(findstring SunOS,$(shell uname -s)),) CC = gcc endif +ifeq ($(ARCH), arm) +ifneq ($(findstring __thumb__,$(shell $(CC) -E -dD $(CFLAGS) include/arm_features.h)),) + # must disable thumb as recompiler can't handle it + CFLAGS += -marm +endif +endif else ifeq ($(platform), linux-portable) TARGET := $(TARGET_NAME)_libretro.so |