Browse Source

Use gcc "-fwhole-program" optimization.

Use "whole program" and "link time optimization" features of gcc.  The
whole-program optimization enables the compiler to evaluate the entire
firmware for optimization instead of just one code file at a time.
This leads to better overall optimizations.
Kevin O'Connor 11 years ago
parent
commit
0908458381
1 changed files with 26 additions and 16 deletions
  1. 26
    16
      Marlin/Makefile

+ 26
- 16
Marlin/Makefile View File

@@ -227,6 +227,22 @@ OPT = s
227 227
 
228 228
 DEFINES ?=
229 229
 
230
+# Program settings
231
+CC = $(AVR_TOOLS_PATH)avr-gcc
232
+CXX = $(AVR_TOOLS_PATH)avr-g++
233
+OBJCOPY = $(AVR_TOOLS_PATH)avr-objcopy
234
+OBJDUMP = $(AVR_TOOLS_PATH)avr-objdump
235
+AR  = $(AVR_TOOLS_PATH)avr-ar
236
+SIZE = $(AVR_TOOLS_PATH)avr-size
237
+NM = $(AVR_TOOLS_PATH)avr-nm
238
+AVRDUDE = avrdude
239
+REMOVE = rm -f
240
+MV = mv -f
241
+
242
+# Tool for testing compiler flags
243
+cc-option=$(shell if test -z "`$(1) $(2) -S -o /dev/null -xc /dev/null 2>&1`" \
244
+    ; then echo "$(2)"; else echo "$(3)"; fi ;)
245
+
230 246
 # Place -D or -U options here
231 247
 CDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
232 248
 CXXDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
@@ -251,8 +267,10 @@ CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
251 267
 endif
252 268
 #CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
253 269
 
254
-CFLAGS = $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING)
255
-CXXFLAGS =         $(CDEFS) $(CINCS) -O$(OPT) -Wall    $(CEXTRA) $(CTUNING)
270
+CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING) \
271
+    $(call cc-option,$(CC),-flto -fwhole-program,)
272
+CXXFLAGS :=         $(CDEFS) $(CINCS) -O$(OPT) -Wall    $(CEXTRA) $(CTUNING) \
273
+    $(call cc-option,$(CC),-flto -fwhole-program,)
256 274
 #ASFLAGS = -Wa,-adhlns=$(<:.S=.lst),-gstabs 
257 275
 LDFLAGS = -lm -Wl,--relax
258 276
 
@@ -264,18 +282,6 @@ AVRDUDE_FLAGS = -D -C $(ARDUINO_INSTALL_DIR)/hardware/tools/avrdude.conf \
264 282
 	-p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER) \
265 283
 	-b $(UPLOAD_RATE)
266 284
 
267
-# Program settings
268
-CC = $(AVR_TOOLS_PATH)avr-gcc
269
-CXX = $(AVR_TOOLS_PATH)avr-g++
270
-OBJCOPY = $(AVR_TOOLS_PATH)avr-objcopy
271
-OBJDUMP = $(AVR_TOOLS_PATH)avr-objdump
272
-AR  = $(AVR_TOOLS_PATH)avr-ar
273
-SIZE = $(AVR_TOOLS_PATH)avr-size
274
-NM = $(AVR_TOOLS_PATH)avr-nm
275
-AVRDUDE = avrdude
276
-REMOVE = rm -f
277
-MV = mv -f
278
-
279 285
 # Define all object files.
280 286
 OBJ = ${patsubst %.c, $(BUILD_DIR)/%.o, ${SRC}}
281 287
 OBJ += ${patsubst %.cpp, $(BUILD_DIR)/%.o, ${CXXSRC}}
@@ -372,9 +378,13 @@ extcoff: $(TARGET).elf
372 378
 	$(NM) -n $< > $@
373 379
 
374 380
 	# Link: create ELF output file from library.
375
-$(BUILD_DIR)/$(TARGET).elf: $(OBJ) Configuration.h
381
+$(BUILD_DIR)/$(TARGET).elf: $(BUILD_DIR)/$(TARGET).o
382
+	$(Pecho) "  CXX   $@"
383
+	$P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ -L. $^ $(LDFLAGS)
384
+
385
+$(BUILD_DIR)/$(TARGET).o: $(OBJ) Configuration.h
376 386
 	$(Pecho) "  CXX   $@"
377
-	$P $(CC) $(ALL_CXXFLAGS) -Wl,--gc-sections -o $@ -L. $(OBJ) $(LDFLAGS)
387
+	$P $(CC) $(ALL_CXXFLAGS) -nostdlib -Wl,-r -o $@ $(OBJ)
378 388
 
379 389
 $(BUILD_DIR)/%.o: %.c Configuration.h Configuration_adv.h $(MAKEFILE)
380 390
 	$(Pecho) "  CC    $<"

Loading…
Cancel
Save