dominic/Arduino-Makefile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Allow target specific optimization levels/debug flags

Browse source 
Changing the optimization level from -Os to something else breaks the
SoftwareSerial library. This patch allow optimization flags to be set on a
per target basis.
This commit is contained in:
mahoy 2013-12-20 01:11:13 +01:00
parent e721a249cd
commit d3e7eedd5f
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
HISTORY.md
View file

@ -18,6 +18,7 @@ I tried to give credit whenever possible. If I have missed anyone, kindly add it
- Tweak: Don't append port details to avrdude for usbtiny. Fix #140 and #138 (https://github.com/PPvG) - Tweak: Don't append port details to avrdude for usbtiny. Fix #140 and #138 (https://github.com/PPvG)
- Fix: Handle relative paths of bootloader file while burning bootloaders. Fix #126 and #142 (https://github.com/sej7278) - Fix: Handle relative paths of bootloader file while burning bootloaders. Fix #126 and #142 (https://github.com/sej7278)
- New: Add `CONTRIBUTING.md` explaining how to contribute to the project. - New: Add `CONTRIBUTING.md` explaining how to contribute to the project.
- Force -Os optimization for SoftwareSerial. Add `OPTIMIZATION_FLAGS` and `DEBUG_FLAGS`.
### 1.0.1 (2013-09-25) ### 1.0.1 (2013-09-25)
- Unconditionally add -D in avrdude options. See #114 - Unconditionally add -D in avrdude options. See #114

13
arduino-mk/Arduino.mk
View file

@ -780,6 +780,13 @@ else
$(call show_config_variable,OPTIMIZATION_LEVEL,[USER]) $(call show_config_variable,OPTIMIZATION_LEVEL,[USER])
endif endif
ifndef DEBUG_FLAGS
DEBUG_FLAGS = -O0 -g
endif
# SoftwareSerial requires -Os (some delays are tuned for this optimization level)
%SoftwareSerial.o : OPTIMIZATION_FLAGS = -Os
ifndef MCU_FLAG_NAME ifndef MCU_FLAG_NAME
MCU_FLAG_NAME = mmcu MCU_FLAG_NAME = mmcu
$(call show_config_variable,MCU_FLAG_NAME,[DEFAULT]) $(call show_config_variable,MCU_FLAG_NAME,[DEFAULT])
@ -794,11 +801,13 @@ CPPFLAGS += -$(MCU_FLAG_NAME)=$(MCU) -DF_CPU=$(F_CPU) -DARDUINO=$(ARDUINO_V
-fdata-sections -fdata-sections
ifdef DEBUG ifdef DEBUG
CPPFLAGS += -O0 -g OPTIMIZATION_FLAGS= $(DEBUG_FLAGS)
else else
CPPFLAGS += -O$(OPTIMIZATION_LEVEL) OPTIMIZATION_FLAGS = -O$(OPTIMIZATION_LEVEL)
endif endif
CPPFLAGS += $(OPTIMIZATION_FLAGS)
# USB IDs for the Caterina devices like leonardo or micro # USB IDs for the Caterina devices like leonardo or micro
ifneq ($(CATERINA),) ifneq ($(CATERINA),)
CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID) CPPFLAGS += -DUSB_VID=$(USB_VID) -DUSB_PID=$(USB_PID)