Commit c3ae03ff authored by Paul Sokolovsky's avatar Paul Sokolovsky Committed by Damien George
Browse files

unix: Fix thumb2 vs arm native emitter auto-detection.

Make thumb2 have priority over arm.
parent 351424e7
...@@ -35,8 +35,11 @@ ...@@ -35,8 +35,11 @@
#endif #endif
#if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__) #if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__)
#define MICROPY_EMIT_THUMB (1) #define MICROPY_EMIT_THUMB (1)
#define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1))
#endif #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) #define MICROPY_EMIT_ARM (1)
#endif #endif
#define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_MODULE_CONST (1)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment