From 0522d9a4f535a61953da64518097fc7f64d7120c Mon Sep 17 00:00:00 2001
From: David Guillen Fandos
Date: Tue, 9 Mar 2021 19:29:18 +0100
Subject: Add workaround for Android ARM builds

While we are at it, use ARM mode for better performance.
---
 cpu_threaded.c | 6 ++++++
 jni/Android.mk | 1 +
 2 files changed, 7 insertions(+)

diff --git a/cpu_threaded.c b/cpu_threaded.c
index df563d2..fd8d44f 100644
--- a/cpu_threaded.c
+++ b/cpu_threaded.c
@@ -54,7 +54,13 @@ u8 *rom_translation_ptr = rom_translation_cache;
 u8 *ram_translation_ptr = ram_translation_cache;
 u8 *bios_translation_ptr = bios_translation_cache;
 #elif defined(ARM_MEMORY_DYNAREC)
+
+#ifdef __ANDROID__
+// Workaround for 'attempt to map x bytes at offset y'
+__asm__(".section .jit,\"awx\",%progbits");
+#else
 __asm__(".section .jit,\"awx\",%nobits");
+#endif
 
 u8 rom_translation_cache[ROM_TRANSLATION_CACHE_SIZE]
 		__attribute__ ((aligned(4),section(".jit")));
diff --git a/jni/Android.mk b/jni/Android.mk
index dc86e69..92f8929 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -36,4 +36,5 @@ LOCAL_SRC_FILES := $(SOURCES_C) $(SOURCES_ASM)
 LOCAL_CFLAGS    := $(COREFLAGS) $(INCFLAGS)
 LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/link.T
 LOCAL_LDLIBS    := $(CORE_LDLIBS)
+LOCAL_ARM_MODE  := arm
 include $(BUILD_SHARED_LIBRARY)
-- 
cgit v1.2.3