diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-03-01 21:44:38 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-03-01 21:44:38 +0000 |
| commit | 6019754b7a717d6a97e04687414e516cbbfdadae (patch) | |
| tree | e6ec2c2b88643d87caff84ff5a94b8f6e6a825e0 /LUFA | |
| parent | 39ffce948a7069db390f07c43506ebbe8421962e (diff) | |
| download | lufa-6019754b7a717d6a97e04687414e516cbbfdadae.tar.gz lufa-6019754b7a717d6a97e04687414e516cbbfdadae.tar.bz2 lufa-6019754b7a717d6a97e04687414e516cbbfdadae.zip | |
Use dedicated -mrelax linker option in the Atmel Studio integration toolchain configurations, rather than a freeform linker switch.
Diffstat (limited to 'LUFA')
| -rw-r--r-- | LUFA/StudioIntegration/lufa_toolchain.xml | 4 | ||||
| -rw-r--r-- | LUFA/StudioIntegration/makefile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/LUFA/StudioIntegration/lufa_toolchain.xml b/LUFA/StudioIntegration/lufa_toolchain.xml index 4e4b09268..45a9ba902 100644 --- a/LUFA/StudioIntegration/lufa_toolchain.xml +++ b/LUFA/StudioIntegration/lufa_toolchain.xml @@ -22,7 +22,7 @@ <toolchain-config name="avrgcc.compiler.warnings.AllWarnings" value="True" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.compiler.miscellaneous.OtherFlags" value="-std=gnu99 -fno-strict-aliasing" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avrgcc"/>
- <toolchain-config name="avrgcc.linker.miscellaneous.LinkerFlags" value="-Wl,--relax" toolchain="avrgcc"/>
+ <toolchain-config name="avrgcc.linker.optimization.RelaxBranches" value="True" toolchain="avrgcc"/>
</module>
</select-by-device>
@@ -37,7 +37,7 @@ <toolchain-config name="avr32gcc.compiler.warnings.AllWarnings" value="True" toolchain="avr32gcc"/>
<toolchain-config name="avr32gcc.compiler.miscellaneous.OtherFlags" value="-std=gnu99 -fno-strict-aliasing -mno-cond-exec-before-reload" toolchain="avr32gcc"/>
<toolchain-config name="avr32gcc.linker.optimization.GarbageCollectUnusedSections" value="True" toolchain="avr32gcc"/>
- <toolchain-config name="avr32gcc.linker.miscellaneous.LinkerFlags" value="-Wl,--relax" toolchain="avr32gcc"/>
+ <toolchain-config name="avr32gcc.linker.optimization.RelaxBranches" value="True" toolchain="avr32gcc"/>
</module>
</asf>
</lufa>
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile index b5c6f0228..9dee43797 100644 --- a/LUFA/StudioIntegration/makefile +++ b/LUFA/StudioIntegration/makefile @@ -21,7 +21,7 @@ EXT_VERSION_NUM := $(shell date +"%y.%m.%d").$(LUFA_VERSION_NUM) all: generate_xml check_filenames generate_vsix clean: - @rm $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) + @rm -f $(TEMP_MANIFEST_XML) $(MODULE_OUTPUT_XML) $(EXTENSION_OUTPUT_XML) $(DOXYGEN_TAG_FILE_XML): $(MAKE) -C ../ doxygen |