Skip to content

Commit c116e48

Browse files
authored
Merge pull request #510 from sej7278/master
Add -fno-devirtualize to CXXFLAGS_STD
2 parents d738cac + d1156e8 commit c116e48

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

Arduino.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ endif
10451045

10461046
ifndef CFLAGS_STD
10471047
ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
1048-
CFLAGS_STD = -std=gnu11 -flto -fno-fat-lto-objects
1048+
CFLAGS_STD = -std=gnu11 -flto -fno-fat-lto-objects -fdiagnostics-color
10491049
else
10501050
CFLAGS_STD =
10511051
endif
@@ -1056,7 +1056,7 @@ endif
10561056

10571057
ifndef CXXFLAGS_STD
10581058
ifeq ($(shell expr $(CC_VERNUM) '>' 490), 1)
1059-
CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics -flto
1059+
CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics -flto -fno-devirtualize -fdiagnostics-color
10601060
else
10611061
CXXFLAGS_STD =
10621062
endif
@@ -1164,7 +1164,7 @@ endif
11641164

11651165
########################################################################
11661166
# Tools version info
1167-
ARDMK_VERSION = 1.5
1167+
ARDMK_VERSION = 1.6
11681168
$(call show_config_variable,ARDMK_VERSION,[COMPUTED])
11691169

11701170
CC_VERSION := $(shell $(CC) -dumpversion)

HISTORY.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ The following is the rough list of changes that went into different versions.
55
I tried to give credit whenever possible. If I have missed anyone, kindly add it to the list.
66

77
### In Development
8-
- TBC
8+
- Fix: Add -fno-devirtualize flag to workaround g++ segfault bug (issue #486). (https://github.com/sej7278)
9+
- Tweak: Set ARDMK_VERSION to 1.6 (https://github.com/sej7278)
10+
- New: Added -fdiagnostics-color to *STD flags (https://github.com/sej7278)
911

1012
### 1.6.0 (2017-07-11)
1113
- Fix: Allowed for SparkFun's weird usb pid/vid submenu shenanigans (issue #499). (https://github.com/sej7278)

0 commit comments

Comments
 (0)