From c3ae03ff18a9236c3b98efcfb581272bc56e292e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 8 May 2015 02:24:43 +0300 Subject: [PATCH] unix: Fix thumb2 vs arm native emitter auto-detection. Make thumb2 have priority over arm. --- unix/mpconfigport.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 31f3afed16..411817130a 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -35,8 +35,11 @@ #endif #if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__) #define MICROPY_EMIT_THUMB (1) + #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1)) #endif -#if !defined(MICROPY_EMIT_ARM) && defined(__arm__) +// Some compilers define __thumb2__ and __arm__ at the same time, let +// autodetected thumb2 emitter have priority. +#if !defined(MICROPY_EMIT_ARM) && defined(__arm__) && !defined(__thumb2__) #define MICROPY_EMIT_ARM (1) #endif #define MICROPY_COMP_MODULE_CONST (1)