From 2af89fb5468be68dfdc1188a8be2a1feb4451bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9a=20Saviot?= <lea.saviot@numworks.com>
Date: Thu, 9 Jul 2020 17:38:01 +0200
Subject: [PATCH] [build/android] Prevent code relocations in MicroPython

---
 build/toolchain.android.mak | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/toolchain.android.mak b/build/toolchain.android.mak
index ed6762dbf..c22cfd1b3 100644
--- a/build/toolchain.android.mak
+++ b/build/toolchain.android.mak
@@ -34,6 +34,10 @@ CXX = $(NDK_TOOLCHAIN_PATH)/$(NDK_TARGET)$(NDK_VERSION)-clang++
 LD = $(NDK_TOOLCHAIN_PATH)/$(NDK_TARGET)$(NDK_VERSION)-clang++
 
 SFLAGS += -fPIC
+# If MICROPY_NLR_SETJMP is 0, the MicroPython NLR is done by
+# python/src/py/nlrthumb.c and creates code containing relocations, which is not
+# accepted by Android.
+SFLAGS += -DMICROPY_NLR_SETJMP=1
 
 LDFLAGS += -shared
 LDFLAGS += -static-libstdc++