|
@@ -380,16 +380,14 @@ endif
|
380
|
380
|
CINCS = ${addprefix -I ,${VPATH}}
|
381
|
381
|
CXXINCS = ${addprefix -I ,${VPATH}}
|
382
|
382
|
|
383
|
|
-# Compiler flag to set the C Standard level.
|
384
|
|
-# c89 - "ANSI" C
|
385
|
|
-# gnu89 - c89 plus GCC extensions
|
386
|
|
-# c99 - ISO C99 standard (not yet fully implemented)
|
387
|
|
-# gnu99 - c99 plus GCC extensions
|
388
|
|
-#CSTANDARD = -std=gnu99
|
|
383
|
+# Compiler flag to set the C/CPP Standard level.
|
|
384
|
+CSTANDARD = -std=gnu99
|
|
385
|
+CXXSTANDARD = -std=gnu++11
|
389
|
386
|
CDEBUG = -g$(DEBUG)
|
390
|
387
|
CWARN = -Wall -Wstrict-prototypes
|
391
|
388
|
CTUNING = -funsigned-char -funsigned-bitfields -fpack-struct \
|
392
|
389
|
-fshort-enums -w -ffunction-sections -fdata-sections \
|
|
390
|
+ -flto \
|
393
|
391
|
-DARDUINO=$(ARDUINO_VERSION)
|
394
|
392
|
ifneq ($(HARDWARE_MOTHERBOARD),)
|
395
|
393
|
CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
|
|
@@ -397,8 +395,8 @@ endif
|
397
|
395
|
#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
|
398
|
396
|
CEXTRA = -fno-use-cxa-atexit
|
399
|
397
|
|
400
|
|
-CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING)
|
401
|
|
-CXXFLAGS := $(CDEFS) $(CINCS) -O$(OPT) -Wall $(CEXTRA) $(CTUNING)
|
|
398
|
+CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING) $(CSTANDARD)
|
|
399
|
+CXXFLAGS := $(CDEFS) $(CINCS) -O$(OPT) -Wall $(CEXTRA) $(CTUNING) $(CXXSTANDARD)
|
402
|
400
|
#ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs
|
403
|
401
|
LDFLAGS = -lm
|
404
|
402
|
|
|
@@ -513,7 +511,7 @@ extcoff: $(TARGET).elf
|
513
|
511
|
# Link: create ELF output file from library.
|
514
|
512
|
$(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
|
515
|
513
|
$(Pecho) " CXX $@"
|
516
|
|
- $P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ -L. $(OBJ) $(LDFLAGS)
|
|
514
|
+ $P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections,--relax -o $@ -L. $(OBJ) $(LDFLAGS)
|
517
|
515
|
|
518
|
516
|
$(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
|
519
|
517
|
$(Pecho) " CC $<"
|