mpy-cross fixes

Author: dhalbert

mpy-cross/Makefile

@@ -1,7 +1,7 @@
 include ../py/mkenv.mk
 
 # define main target
-// CIRCUITPY-CHANGE
+# CIRCUITPY-CHANGE
 PROG ?= mpy-cross
 
 # qstr definitions (must come before including py.mk)
@@ -22,7 +22,7 @@ CWARN = -Wall -Werror
 CWARN += -Wextra -Wno-unused-parameter -Wpointer-arith
 CFLAGS += $(INC) $(CWARN) -std=gnu99 $(COPT) $(CFLAGS_EXTRA)
 CFLAGS += -fdata-sections -ffunction-sections -fno-asynchronous-unwind-tables
-// CIRCUITPY-CHANGE
+# CIRCUITPY-CHANGE
 CFLAGS += -DCIRCUITPY
 
 # Debugging/Optimization
@@ -48,7 +48,7 @@ endif
 LDFLAGS += $(LDFLAGS_MOD) $(LDFLAGS_ARCH) -lm $(LDFLAGS_EXTRA)
 
 # source files
-// CIRCUITPY-CHANGE: extra files
+# CIRCUITPY-CHANGE: extra files
 SRC_C = \
 	main.c \
 	gccollect.c \

mpy-cross/mpconfigport.h

@@ -26,6 +26,10 @@
 
 // options to control how MicroPython is built
 
+// CIRCUITPY-CHANGE: mpy-cross doesn't have background tasks
+#define RUN_BACKGROUND_TASKS ((void)0)
+
+
 #define MICROPY_ALLOC_PATH_MAX      (PATH_MAX)
 #define MICROPY_PERSISTENT_CODE_LOAD (0)
 #define MICROPY_PERSISTENT_CODE_SAVE (1)

py/asmx64.h

@@ -124,8 +124,8 @@ void asm_x64_call_ind(asm_x64_t *as, size_t fun_id, int temp_r32);
 // Holds a pointer to mp_fun_table
 #define ASM_X64_REG_FUN_TABLE ASM_X64_REG_RBP
 
-#// CIRCUITPY-CHANGE: prevent #if warning
-if defined(GENERIC_ASM_API) && GENERIC_ASM_API
+// CIRCUITPY-CHANGE: prevent #if warning
+#if defined(GENERIC_ASM_API) && GENERIC_ASM_API
 
 // The following macros provide a (mostly) arch-independent API to
 // generate native code, and are used by the native emitter.