diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2017-04-26 20:45:40 +1000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2017-04-26 20:45:40 +1000 |
| commit | 2cde257fe11886bebbfe4aea816268c2739d89bb (patch) | |
| tree | 31ea944c9300215e227035f13f1a55a8db9193e8 /LUFA/Build/DMBS/DMBS/gcc.mk | |
| parent | a8546529926fc87b5d73b75217ec011962e8ccaa (diff) | |
| download | lufa-2cde257fe11886bebbfe4aea816268c2739d89bb.tar.gz lufa-2cde257fe11886bebbfe4aea816268c2739d89bb.tar.bz2 lufa-2cde257fe11886bebbfe4aea816268c2739d89bb.zip | |
Update to latest DMBS revision.
Diffstat (limited to 'LUFA/Build/DMBS/DMBS/gcc.mk')
| -rw-r--r-- | LUFA/Build/DMBS/DMBS/gcc.mk | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/LUFA/Build/DMBS/DMBS/gcc.mk b/LUFA/Build/DMBS/DMBS/gcc.mk index 3affa6346..6126cf97f 100644 --- a/LUFA/Build/DMBS/DMBS/gcc.mk +++ b/LUFA/Build/DMBS/DMBS/gcc.mk @@ -9,7 +9,7 @@ DMBS_BUILD_MODULES += GCC DMBS_BUILD_TARGETS += size symbol-sizes all lib elf bin hex lss clean mostlyclean DMBS_BUILD_MANDATORY_VARS += TARGET ARCH MCU SRC -DMBS_BUILD_OPTIONAL_VARS += BOARD OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS OBJDIR OBJECT_FILES DEBUG_TYPE DEBUG_LEVEL LINKER_RELAXATIONS COMPILER_PATH +DMBS_BUILD_OPTIONAL_VARS += COMPILER_PATH OPTIMIZATION C_STANDARD CPP_STANDARD F_CPU C_FLAGS CPP_FLAGS ASM_FLAGS CC_FLAGS LD_FLAGS OBJDIR OBJECT_FILES DEBUG_TYPE DEBUG_LEVEL LINKER_RELAXATIONS JUMP_TABLES DMBS_BUILD_PROVIDED_VARS += DMBS_BUILD_PROVIDED_MACROS += @@ -34,6 +34,7 @@ OBJECT_FILES ?= DEBUG_FORMAT ?= dwarf-2 DEBUG_LEVEL ?= 2 LINKER_RELAXATIONS ?= Y +JUMP_TABLES ?= N # Sanity check user supplied values $(foreach MANDATORY_VAR, $(DMBS_BUILD_MANDATORY_VARS), $(call ERROR_IF_UNSET, $(MANDATORY_VAR))) @@ -47,6 +48,7 @@ $(call ERROR_IF_EMPTY, OBJDIR) $(call ERROR_IF_EMPTY, DEBUG_FORMAT) $(call ERROR_IF_EMPTY, DEBUG_LEVEL) $(call ERROR_IF_NONBOOL, LINKER_RELAXATIONS) +$(call ERROR_IF_NONBOOL, JUMP_TABLES) # Determine the utility prefix to use for the selected architecture ifeq ($(ARCH), AVR8) @@ -117,7 +119,14 @@ ifneq ($(F_CPU),) BASE_CC_FLAGS += -DF_CPU=$(F_CPU)UL endif ifeq ($(LINKER_RELAXATIONS), Y) -BASE_CC_FLAGS += -mrelax + BASE_CC_FLAGS += -mrelax +endif +ifeq ($(JUMP_TABLES), N) + # This flag is required for bootloaders as GCC will emit invalid jump table + # assembly code for devices with large amounts of flash; the jump table target + # is extracted from FLASH without using the correct ELPM instruction, resulting + # in a pseudo-random jump target. + BASE_CC_FLAGS += -fno-jump-tables endif # Additional language specific compiler flags @@ -125,12 +134,6 @@ BASE_C_FLAGS := -x c -O$(OPTIMIZATION) -std=$(C_STANDARD) -Wstrict-prototypes BASE_CPP_FLAGS := -x c++ -O$(OPTIMIZATION) -std=$(CPP_STANDARD) BASE_ASM_FLAGS := -x assembler-with-cpp -# This flag is required for bootloaders as GCC will emit invalid jump table -# assembly code for devices with large amounts of flash; the jump table target -# is extracted from FLASH without using the correct ELPM instruction, resulting -# in a pseudo-random jump target. -BASE_CC_FLAGS += -fno-jump-tables - # Create a list of flags to pass to the linker BASE_LD_FLAGS := -lm -Wl,-Map=$(TARGET).map,--cref -Wl,--gc-sections ifeq ($(LINKER_RELAXATIONS), Y) |