CPU/CodeCache: Use code buffer section on Android

stenzek · Dec 8, 2024 · 5bf7227 · 5bf7227
1 parent 1adf36c
commit 5bf7227
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/core/cpu_code_cache.cpp b/src/core/cpu_code_cache.cpp
@@ -130,10 +130,11 @@ static constexpr u32 RECOMPILER_CODE_CACHE_SIZE = 48 * 1024 * 1024;
 static constexpr u32 RECOMPILER_FAR_CODE_CACHE_SIZE = 16 * 1024 * 1024;
 #endif
 
-// On Linux ARM32/ARM64, we use a dedicated section in the ELF for storing code.
-// This is because without ASLR, or on certain ASLR offsets, the sbrk() heap ends up immediately following the text/data
-// sections, which means there isn't a large enough gap to fit within range on ARM32.
-#if defined(__linux__) && (defined(CPU_ARCH_ARM32) || defined(CPU_ARCH_ARM64))
+// On Linux ARM32/ARM64, we use a dedicated section in the ELF for storing code. This is because without
+// ASLR, or on certain ASLR offsets, the sbrk() heap ends up immediately following the text/data sections,
+// which means there isn't a large enough gap to fit within range on ARM32. Also enable it for Android,
+// because MAP_FIXED_NOREPLACE may not exist on older kernels.
+#if (defined(__linux__) && (defined(CPU_ARCH_ARM32) || defined(CPU_ARCH_ARM64))) || defined(__ANDROID__)
 #define USE_CODE_BUFFER_SECTION 1
 #ifdef __clang__
 #pragma clang section bss = ".jitstorage"