From 62111f240e7be9398899ae065736324581726ba3 Mon Sep 17 00:00:00 2001 From: Jan Pochyla Date: Wed, 13 Jun 2018 16:15:57 +0200 Subject: [PATCH] unix: remove native emitters They are not being used in any trezor code. --- SConscript.unix | 21 +-------------------- embed/unix/mpconfigport.h | 8 ++++---- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/SConscript.unix b/SConscript.unix index 4549d8d58b..47746e507b 100644 --- a/SConscript.unix +++ b/SConscript.unix @@ -133,8 +133,6 @@ SOURCE_MICROPYTHON = [ 'vendor/micropython/py/emitbc.c', 'vendor/micropython/py/emitcommon.c', 'vendor/micropython/py/emitglue.c', - 'vendor/micropython/py/emitinlinethumb.c', - 'vendor/micropython/py/emitinlinextensa.c', 'vendor/micropython/py/formatfloat.c', 'vendor/micropython/py/frozenmod.c', 'vendor/micropython/py/gc.c', @@ -231,9 +229,7 @@ SOURCE_UNIX = [ 'embed/unix/usb.c', ] -SOURCE_EMIT_NATIVE = ['vendor/micropython/py/emitnative.c'] - -SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX + SOURCE_EMIT_NATIVE +SOURCE_QSTR = SOURCE_MOD + SOURCE_MICROPYTHON + SOURCE_UNIX env = Environment(ENV=os.environ, CFLAGS=ARGUMENTS.get('CFLAGS', '')) @@ -315,21 +311,6 @@ obj_program += env.Object(source=SOURCE_MOD) obj_program += env.Object(source=SOURCE_MICROPYTHON) obj_program += env.Object(source=SOURCE_UNIX) -obj_program += env.Object( - source=SOURCE_EMIT_NATIVE, - target='vendor/micropython/py/emitnx64.o', - CPPDEFINES=[env['CPPDEFINES'], 'N_X64'], ) - -obj_program += env.Object( - source=SOURCE_EMIT_NATIVE, - target='vendor/micropython/py/emitnx86.o', - CPPDEFINES=[env['CPPDEFINES'], 'N_X86'], ) - -obj_program += env.Object( - source=SOURCE_EMIT_NATIVE, - target='vendor/micropython/py/emitnthumb.o', - CPPDEFINES=[env['CPPDEFINES'], 'N_THUMB'], ) - env.Depends(obj_program, qstr_generated) program = env.Command( diff --git a/embed/unix/mpconfigport.h b/embed/unix/mpconfigport.h index ba4d18f795..b83895fb37 100644 --- a/embed/unix/mpconfigport.h +++ b/embed/unix/mpconfigport.h @@ -29,19 +29,19 @@ #define MICROPY_ALLOC_PATH_MAX (PATH_MAX) #define MICROPY_PERSISTENT_CODE_LOAD (1) #if !defined(MICROPY_EMIT_X64) && defined(__x86_64__) - #define MICROPY_EMIT_X64 (1) + #define MICROPY_EMIT_X64 (0) #endif #if !defined(MICROPY_EMIT_X86) && defined(__i386__) - #define MICROPY_EMIT_X86 (1) + #define MICROPY_EMIT_X86 (0) #endif #if !defined(MICROPY_EMIT_THUMB) && defined(__thumb2__) - #define MICROPY_EMIT_THUMB (1) + #define MICROPY_EMIT_THUMB (0) #define MICROPY_MAKE_POINTER_CALLABLE(p) ((void*)((mp_uint_t)(p) | 1)) #endif // 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 (0) #endif #define MICROPY_COMP_MODULE_CONST (1) #define MICROPY_COMP_TRIPLE_TUPLE_ASSIGN (1)