From 6019754b7a717d6a97e04687414e516cbbfdadae Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Fri, 1 Mar 2013 21:44:38 +0000
Subject: Use dedicated -mrelax linker option in the Atmel Studio integration
 toolchain configurations, rather than a freeform linker switch.

---
 LUFA/StudioIntegration/lufa_toolchain.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'LUFA/StudioIntegration/lufa_toolchain.xml')

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>
-- 
cgit v1.2.3