Skip to content

Commit e1a904f

Browse files
authored
Merge pull request #2306 from jepler/gcc9
build.yml: Use a newer build toolchain
2 parents dd30a7f + 002f5c0 commit e1a904f

File tree

6 files changed

+23
-2
lines changed

6 files changed

+23
-2
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ jobs:
169169
run: |
170170
sudo apt-get install -y gettext
171171
pip install requests sh click setuptools awscli
172-
wget https://s3.amazonaws.com/adafruit-circuit-python/gcc-arm-embedded_7-2018q2-1~xenial1_amd64.deb && sudo dpkg -i gcc-arm-embedded*_amd64.deb
172+
wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
173+
sudo tar -C /usr --strip-components=1 -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
173174
- name: Versions
174175
run: |
175176
gcc --version

ports/atmel-samd/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,16 @@ else
122122
ifdef CFLAGS_INLINE_LIMIT
123123
CFLAGS += -finline-limit=$(CFLAGS_INLINE_LIMIT)
124124
endif
125+
125126
CFLAGS += -flto -flto-partition=none
127+
128+
ifeq ($(CIRCUITPY_SMALL_BUILD),1)
129+
CFLAGS += --param inline-unit-growth=15 --param max-inline-insns-auto=20
130+
endif
131+
132+
ifdef CFLAGS_BOARD
133+
CFLAGS += $(CFLAGS_BOARD)
134+
endif
126135
endif
127136

128137
CFLAGS += $(INC) -Wall -Werror -std=gnu11 -nostdlib $(BASE_CFLAGS) $(CFLAGS_MOD) $(COPT)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ CIRCUITPY_USB_MIDI = 0
2323
SUPEROPT_GC = 0
2424

2525
FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
26+
27+
CFLAGS_BOARD = --param max-inline-insns-auto=15

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ SUPEROPT_GC = 0
2929
# FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_DotStar
3030
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_HID
3131
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_IRRemote
32+
33+
CFLAGS_BOARD = --param max-inline-insns-auto=12

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ CIRCUITPY_SMALL_BUILD = 1
1313

1414
SUPEROPT_GC = 0
1515

16+
CFLAGS_BOARD = --param max-inline-insns-auto=15
1617
ifeq ($(TRANSLATION), zh_Latn_pinyin)
1718
CFLAGS_INLINE_LIMIT = 35
18-
endif
19+
endif

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,9 @@ LONGINT_IMPL = NONE
1212
CIRCUITPY_SMALL_BUILD = 1
1313

1414
SUPEROPT_GC = 0
15+
16+
CFLAGS_BOARD = --param max-inline-insns-auto=15
17+
ifeq ($(TRANSLATION), zh_Latn_pinyin)
18+
CFLAGS_INLINE_LIMIT = 35
19+
endif
20+

0 commit comments

Comments
 (0)