mirror of
https://github.com/licsber/micropython.git
synced 2024-09-21 01:20:23 +08:00
b184b6ae53
The number of registers used should be 10, not 12, to match the assembly code in nlrx64.c. With this change the 64bit mingw builds don't need to use the setjmp implementation, and this fixes miscellaneous crashes and assertion failures as reported in #1751 for instance. To avoid mistakes in the future where something gcc-related for Windows only gets fixed for one particular compiler/environment combination, make use of a MICROPY_NLR_OS_WINDOWS macro. To make sure everything nlr-related is now ok when built with gcc this has been verified with: - unix port built with gcc on Cygwin (i686-pc-cygwin-gcc and x86_64-pc-cygwin-gcc, version 6.4.0) - windows port built with mingw-w64's gcc from Cygwin (i686-w64-mingw32-gcc and x86_64-w64-mingw32-gcc, version 6.4.0) and MSYS2 (like the ones on Cygwin but version 7.2.0)
62 lines
1.2 KiB
Makefile
62 lines
1.2 KiB
Makefile
include ../../py/mkenv.mk
|
|
-include mpconfigport.mk
|
|
|
|
# define main target
|
|
PROG = micropython.exe
|
|
|
|
# qstr definitions (must come before including py.mk)
|
|
QSTR_DEFS = ../unix/qstrdefsport.h
|
|
|
|
# include py core make definitions
|
|
include $(TOP)/py/py.mk
|
|
|
|
INC += -I.
|
|
INC += -I$(TOP)
|
|
INC += -I$(BUILD)
|
|
|
|
# compiler settings
|
|
CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 -DUNIX -D__USE_MINGW_ANSI_STDIO=1 $(CFLAGS_MOD) $(COPT)
|
|
LDFLAGS = $(LDFLAGS_MOD) -lm
|
|
|
|
# Debugging/Optimization
|
|
ifdef DEBUG
|
|
CFLAGS += -g
|
|
COPT = -O0
|
|
else
|
|
COPT = -Os #-DNDEBUG
|
|
endif
|
|
|
|
# source files
|
|
SRC_C = \
|
|
ports/unix/main.c \
|
|
ports/unix/file.c \
|
|
ports/unix/input.c \
|
|
ports/unix/modos.c \
|
|
ports/unix/modmachine.c \
|
|
ports/unix/modtime.c \
|
|
ports/unix/gccollect.c \
|
|
windows_mphal.c \
|
|
realpath.c \
|
|
init.c \
|
|
sleep.c \
|
|
|
|
OBJ = $(PY_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
|
|
|
|
ifeq ($(MICROPY_USE_READLINE),1)
|
|
CFLAGS_MOD += -DMICROPY_USE_READLINE=1
|
|
SRC_C += lib/mp-readline/readline.c
|
|
else ifeq ($(MICROPY_USE_READLINE),2)
|
|
CFLAGS_MOD += -DMICROPY_USE_READLINE=2
|
|
LDFLAGS_MOD += -lreadline
|
|
endif
|
|
|
|
LIB += -lws2_32
|
|
|
|
# List of sources for qstr extraction
|
|
SRC_QSTR += $(SRC_C)
|
|
# Append any auto-generated sources that are needed by sources listed in
|
|
# SRC_QSTR
|
|
SRC_QSTR_AUTO_DEPS +=
|
|
|
|
include $(TOP)/py/mkrules.mk
|