From 9783e68bc874329d33122b0fbdf5f3ffe79383f6 Mon Sep 17 00:00:00 2001 From: John Whittington Date: Mon, 25 Mar 2019 13:36:03 +0000 Subject: add swtich for ARM 'avr-size' so that .elf is passed as arg `avr-size` was defaulting to AVR non-aware when using ARM builds, which meant passing .hex rather than .elf to size and limiting size readout. Adding a switch for defining `avr-size` and SIZEFLAGS to Sam.mk seems like the best way to include proper ARM support (despite conflicting naming). --- Arduino.mk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Arduino.mk') diff --git a/Arduino.mk b/Arduino.mk index 808c6a9..0a0fd75 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1286,9 +1286,14 @@ ifneq (,$(findstring AVR,$(shell $(SIZE) --help))) avr_size = $(SIZE) $(SIZEFLAGS) --format=avr $(1) $(call show_config_info,Size utility: AVR-aware for enhanced output,[AUTODETECTED]) else - # We have a plain-old binutils version - just give it the hex. - avr_size = $(SIZE) $(2) - $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED]) + ifeq ($(findstring sam, $(strip $(ARCHITECTURE))), sam) + avr_size = $(SIZE) $(SIZEFLAGS) $(1) + $(call show_config_info,Size utility: ARM,[AUTODETECTED]) + else + # We have a plain-old binutils version - just give it the hex. + avr_size = $(SIZE) $(2) + $(call show_config_info,Size utility: Basic (not AVR-aware),[AUTODETECTED]) + endif endif ifneq (,$(strip $(ARDUINO_LIBS))) -- cgit v1.2.3