Merge pull request #2693 from jepler/ulab-enable

ulab: enable on most builds

Author: dhalbert

ports/atmel-samd/mpconfigport.mk

@@ -40,6 +40,8 @@ endif
 # SAMD21 needs separate endpoint pairs for MSC BULK IN and BULK OUT, otherwise it's erratic.
 USB_MSC_EP_NUM_OUT = 1
 
+MICROPY_PY_ULAB = 0
+
 endif # samd21
 
 # Put samd51-only choices here.

ports/cxd56/Makefile

@@ -176,6 +176,10 @@ OBJ = $(PY_O) $(SUPERVISOR_O) $(addprefix $(BUILD)/, $(SRC_C:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_S:.s=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_COMMON_HAL_EXPANDED:.c=.o))
 OBJ += $(addprefix $(BUILD)/, $(SRC_SHARED_MODULE_EXPANDED:.c=.o))
+ifeq ($(INTERNAL_LIBM),1)
+OBJ += $(addprefix $(BUILD)/, $(SRC_LIBM:.c=.o))
+endif
+OBJ += $(addprefix $(BUILD)/, $(SRC_MOD:.c=.o))
 
 # List of sources for qstr extraction
 SRC_QSTR += $(SRC_C) $(SRC_SUPERVISOR) $(SRC_COMMON_HAL_EXPANDED) $(SRC_SHARED_MODULE_EXPANDED)

ports/cxd56/mpconfigport.mk

@@ -18,3 +18,5 @@ CIRCUITPY_NEOPIXEL_WRITE = 0
 CIRCUITPY_NVM = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FREQUENCYIO = 0
+
+INTERNAL_LIBM = 1

ports/stm32f4/mpconfigport.mk

@@ -71,5 +71,7 @@ endif
 
 CFLAGS += -DMICROPY_CPYTHON_COMPAT=1
 
+MICROPY_PY_ULAB = 1
+
 #ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
 #endif

py/circuitpy_mpconfig.mk

@@ -339,6 +339,11 @@ CIRCUITPY_SERIAL_UART = 0
 endif
 CFLAGS += -DCIRCUITPY_SERIAL_UART=$(CIRCUITPY_SERIAL_UART)
 
+# ulab numerics library
+ifndef MICROPY_PY_ULAB
+MICROPY_PY_ULAB = $(CIRCUITPY_FULL_BUILD)
+endif
+
 # Enabled micropython.native decorator (experimental)
 ifndef CIRCUITPY_ENABLE_MPY_NATIVE
 CIRCUITPY_ENABLE_MPY_NATIVE = 0