Skip to content

Commit 7fc0aa5

Browse files
committed
Fix windows and two samd builds
1 parent 4d77633 commit 7fc0aa5

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

ports/atmel-samd/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,9 @@ SRC_ASF += \
270270
hpl/oscctrl/hpl_oscctrl.c \
271271
hpl/trng/hpl_trng.c \
272272

273+
# Ignore these errors
274+
$(BUILD)/asf4/same54/hpl/sercom/hpl_sercom.o: CFLAGS += -Wno-maybe-uninitialized
275+
273276
else ifeq ($(CHIP_FAMILY), same51)
274277
SRC_ASF += \
275278
hal/src/hal_rand_sync.c \

ports/atmel-samd/boards/feather_m4_can/mpconfigboard.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ LONGINT_IMPL = MPZ
1212

1313
CIRCUITPY__EVE = 1
1414
CIRCUITPY_CANIO = 1
15+
16+
CIRCUITPY_LTO = one

ports/atmel-samd/mpconfigport.mk

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,12 @@ ifeq ($(CHIP_FAMILY),same51)
124124
# No native touchio on SAME51.
125125
CIRCUITPY_TOUCHIO_USE_NATIVE = 0
126126

127+
ifeq ($(CIRCUITPY_FULL_BUILD),1)
128+
CIRCUITPY_LTO ?= balanced
129+
else
130+
CIRCUITPY_LTO ?= one
131+
endif
132+
127133
# The ?='s allow overriding in mpconfigboard.mk.
128134

129135
CIRCUITPY_ALARM ?= 1

py/circuitpy_defns.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ endif
6969

7070
CIRCUITPY_LTO ?= 0
7171
ifneq ($(CIRCUITPY_LTO),0)
72-
CFLAGS += -DCIRCUITPY_LTO=1 -flto=auto -flto-partition=$(CIRCUITPY_LTO)
72+
CFLAGS += -DCIRCUITPY_LTO=1 -flto=$(shell $(NPROC)) -flto-partition=$(CIRCUITPY_LTO)
7373
else
7474
CFLAGS += -DCIRCUITPY_LTO=0
7575
endif

0 commit comments

Comments
 (0)