diff options
| author | Simon John <git@the-jedi.co.uk> | 2019-04-01 10:26:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-01 10:26:33 +0100 |
| commit | f5893dc7a190d60b0511a89446ae569c71b20b8d (patch) | |
| tree | d1fa0244494ddaee8d4a70788a2dcfa65553e671 /Sam.mk | |
| parent | 591855b8904bcff14c7c7f127653186a0b482360 (diff) | |
| parent | 9783e68bc874329d33122b0fbdf5f3ffe79383f6 (diff) | |
Merge pull request #603 from tuna-f1sh/master
add swtich for ARM 'avr-size' so that .elf is passed as arg
Diffstat (limited to 'Sam.mk')
| -rw-r--r-- | Sam.mk | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -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) |