From: Dean Camera Date: Wed, 20 Mar 2013 17:50:56 +0000 (+0000) Subject: Fix corrupted disassembly listing (LSS) files due to linker relaxations; pass -mrelax... X-Git-Tag: LUFA-130901-BETA~201 X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/6e8642185a8db602628ea18e6d03d3f71e8be448?ds=inline Fix corrupted disassembly listing (LSS) files due to linker relaxations; pass -mrelax to the compiler to make it aware of, and able to compensate for, linker relaxations. --- diff --git a/LUFA/Build/lufa_build.mk b/LUFA/Build/lufa_build.mk index 2cc60ad7e..d99f8485b 100644 --- a/LUFA/Build/lufa_build.mk +++ b/LUFA/Build/lufa_build.mk @@ -192,6 +192,9 @@ BASE_CC_FLAGS += -DARCH=ARCH_$(ARCH) -DBOARD=BOARD_$(BOARD) -DF_USB=$(F_USB)UL ifneq ($(F_CPU),) BASE_CC_FLAGS += -DF_CPU=$(F_CPU)UL endif +ifeq ($(LINKER_RELAXATIONS), Y) +BASE_CC_FLAGS += -mrelax +endif # Additional language specific compiler flags BASE_C_FLAGS := -x c -O$(OPTIMIZATION) -std=$(C_STANDARD) -Wstrict-prototypes diff --git a/LUFA/StudioIntegration/lufa_toolchain.xml b/LUFA/StudioIntegration/lufa_toolchain.xml index 45a9ba902..04863cf83 100644 --- a/LUFA/StudioIntegration/lufa_toolchain.xml +++ b/LUFA/StudioIntegration/lufa_toolchain.xml @@ -20,7 +20,7 @@ - + @@ -35,7 +35,7 @@ - +