From e126d37f9b15fd631d029d011bd2ed2a1dc99d7b Mon Sep 17 00:00:00 2001 From: batchy Date: Sat, 21 Jan 2017 12:29:58 +0100 Subject: [PATCH 1/2] History.md: Re-add "In Development" section. --- HISTORY.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/HISTORY.md b/HISTORY.md index aeaae61..e367b3d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -4,6 +4,8 @@ A Makefile for Arduino Sketches The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. +### In Development + ### 1.5.2 (2017-01-11) - New: Add LTO support for users with avr-gcc > 4.9 (issue #446 & #456) (https://github.com/sej7278) From 697c95e26fb23891dd43fc6c2b929363f6fb4590 Mon Sep 17 00:00:00 2001 From: batchy Date: Sat, 21 Jan 2017 12:22:45 +0100 Subject: [PATCH 2/2] Arduino.mk: Fix generating assembly for cpp files. Do not include the Arduino header when generating assembly for .cpp files with generate_assembly. This was likely a copy-paste error. --- Arduino.mk | 2 +- HISTORY.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Arduino.mk b/Arduino.mk index 79f119c..82b4964 100644 --- a/Arduino.mk +++ b/Arduino.mk @@ -1262,7 +1262,7 @@ $(OBJDIR)/%.s: %.ino $(COMMON_DEPS) | $(OBJDIR) $(OBJDIR)/%.s: %.cpp $(COMMON_DEPS) | $(OBJDIR) @$(MKDIR) $(dir $@) - $(CXX) -x c++ -include $(ARDUINO_HEADER) -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ + $(CXX) -x c++ -MMD -S -fverbose-asm $(CPPFLAGS) $(CXXFLAGS) $< -o $@ # core files $(OBJDIR)/core/%.c.o: $(ARDUINO_CORE_PATH)/%.c $(COMMON_DEPS) | $(OBJDIR) diff --git a/HISTORY.md b/HISTORY.md index e367b3d..342885a 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -5,6 +5,7 @@ The following is the rough list of changes that went into different versions. I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list. ### In Development +- Fix: Do not include the Arduino header when calling generate_assembly on .cpp files. (https://github.com/Batchyx) ### 1.5.2 (2017-01-11)