Merge branch 'master' of github.com:micropython/micropython

This commit is contained in:
Damien George 2014-04-14 19:44:49 +01:00
commit 0ae9c7042a
2 changed files with 751 additions and 639 deletions

1388
py/vm.c

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@ QSTR_DEFS = qstrdefsport.h
include ../py/py.mk
# compiler settings
CFLAGS = -I. -I$(PY_SRC) -Wall -Werror -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT)
CFLAGS = -I. -I$(PY_SRC) -Wall -Werror -ansi -std=gnu99 -DUNIX $(CFLAGS_MOD) $(COPT) -DMICROPY_USE_COMPUTED_GOTO
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)