aboutsummaryrefslogtreecommitdiff
path: root/Sam.mk
diff options
context:
space:
mode:
authorJohn Whittington <git@jbrengineering.co.uk>2019-03-25 13:36:03 +0000
committerJohn Whittington <git@jbrengineering.co.uk>2019-03-25 13:36:03 +0000
commit9783e68bc874329d33122b0fbdf5f3ffe79383f6 (patch)
treed1fa0244494ddaee8d4a70788a2dcfa65553e671 /Sam.mk
parent591855b8904bcff14c7c7f127653186a0b482360 (diff)
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).
Diffstat (limited to 'Sam.mk')
-rw-r--r--Sam.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/Sam.mk b/Sam.mk
index b18a6e6..c588662 100644
--- a/Sam.mk
+++ b/Sam.mk
@@ -395,12 +395,7 @@ ifndef BOOTLOADER_PROTECT_VERIFY
endif
endif
-# C99 with GNU extensions required for C sources using old compiler
-CC_VERNUM = $(shell $(CC) -dumpversion | sed 's/\.//g')
-ifneq ($(shell expr $(CC_VERNUM) '>' 490), 1)
- CFLAGS_STD = -std=gnu99
-endif
-
+CFLAGS_STD += -std=gnu11
CPPFLAGS += -DMD -D$(USB_TYPE) '-DUSB_PRODUCT=$(USB_PRODUCT)' '-DUSB_MANUFACTURER=$(USB_MANUFACTURER)'
# Get extra define flags from boards.txt
@@ -414,6 +409,10 @@ CPPFLAGS += -DUSB_PID=$(USB_PID)
CPPFLAGS += -mthumb -nostdlib --param max-inline-insns-single=500 -fno-exceptions -Wl,-Map=$(OBJDIR)/$(TARGET).map
CXXFLAGS += -fno-rtti -fno-threadsafe-statics -std=gnu++11
+ifndef SIZEFLAGS
+ SIZEFLAGS += -B
+endif
+
AMCU := $(call PARSE_BOARD,$(BOARD_TAG),build.mcu)
BOARD_LINKER_SCRIPT := $(call PARSE_BOARD,$(BOARD_TAG),build.ldscript)
OPENOCD_SCRIPT := $(call PARSE_BOARD,$(BOARD_TAG),build.openocdscript)