summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorJeff Epler <jepler@gmail.com>2020-07-30 07:24:48 -0500
committerJeff Epler <jepler@gmail.com>2020-07-30 07:24:48 -0500
commitd69f081c04f32c93054335470cdd4c063fd7cbcb (patch)
tree53f00a8fd4efa3f2c59ec3085808a9fc2cafc7d4 /py
parent57464998c0c97010f6fc5ed1aea009ce6b010272 (diff)
parent531c1e046cf46e626268995de4c34097addc9b60 (diff)
Merge remote-tracking branch 'origin/main' into blm_badge
Diffstat (limited to 'py')
-rw-r--r--py/compile.c3
-rw-r--r--py/py.mk1
2 files changed, 3 insertions, 1 deletions
diff --git a/py/compile.c b/py/compile.c
index fade4c01a..653aae004 100644
--- a/py/compile.c
+++ b/py/compile.c
@@ -1741,7 +1741,8 @@ STATIC void compile_async_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns
uint try_finally_label = comp_next_label(comp);
compile_node(comp, pns->nodes[1]); // iterator
- compile_await_object_method(comp, MP_QSTR___aiter__);
+ EMIT_ARG(load_method, MP_QSTR___aiter__, false);
+ EMIT_ARG(call_method, 0, 0, 0);
compile_store_id(comp, context);
START_BREAK_CONTINUE_BLOCK
diff --git a/py/py.mk b/py/py.mk
index 3e1d7989f..c5073d0f0 100644
--- a/py/py.mk
+++ b/py/py.mk
@@ -107,6 +107,7 @@ endif
ifeq ($(CIRCUITPY_ULAB),1)
SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*.c))
+SRC_MOD += $(patsubst $(TOP)/%,%,$(wildcard $(TOP)/extmod/ulab/code/*/*.c))
CFLAGS_MOD += -DCIRCUITPY_ULAB=1 -DMODULE_ULAB_ENABLED=1
$(BUILD)/extmod/ulab/code/%.o: CFLAGS += -Wno-float-equal -Wno-sign-compare -DCIRCUITPY
endif