aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/StudioIntegration
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2013-02-27 22:10:22 +0000
committerDean Camera <dean@fourwalledcubicle.com>2013-02-27 22:10:22 +0000
commit280fc85d1bcdd453e88de468e3e520dc677fd702 (patch)
treeccb410be22ad04aa7387877446100793989829c0 /LUFA/StudioIntegration
parentfa2a8fca69513d59b008159361ed741a753b6304 (diff)
downloadlufa-280fc85d1bcdd453e88de468e3e520dc677fd702.tar.gz
lufa-280fc85d1bcdd453e88de468e3e520dc677fd702.tar.bz2
lufa-280fc85d1bcdd453e88de468e3e520dc677fd702.zip
Use a slightly less insane/redundant toolchain configuration from within Atmel Studio.
Diffstat (limited to 'LUFA/StudioIntegration')
-rw-r--r--LUFA/StudioIntegration/lufa_toolchain.xml18
1 files changed, 7 insertions, 11 deletions
diff --git a/LUFA/StudioIntegration/lufa_toolchain.xml b/LUFA/StudioIntegration/lufa_toolchain.xml
index 555e34b1f..4e4b09268 100644
--- a/LUFA/StudioIntegration/lufa_toolchain.xml
+++ b/LUFA/StudioIntegration/lufa_toolchain.xml
@@ -10,38 +10,34 @@
<lufa>
<asf>
- <!-- Sourced from Atmel ASF 3.6.0, required for extensions to pass project generator validation -->
<select-by-device id="common.utils.toolchain_config" caption="Toolchain configuration defaults">
<module type="build-specific" id="common.utils.toolchain_config#avr" caption="Toolchain configuration defaults for 8-bit AVR">
<info type="gui-flag" value="hidden"/>
<device-support value="avr"/>
- <toolchain-config name="avrgcc.assembler.general.AssemblerFlags" value="-mrelax" toolchain="avrgcc"/>
- <toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="False" toolchain="avrgcc"/>
- <toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="False" toolchain="avrgcc"/>
+ <toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avrgcc"/>
+ <toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.compiler.warnings.AllWarnings" value="True" toolchain="avrgcc"/>
- <toolchain-config name="avrgcc.compiler.miscellaneous.OtherFlags" value="-std=gnu99 -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax -fno-strict-aliasing" 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.optimization.RelaxBranches" value="True" toolchain="avrgcc"/>
<toolchain-config name="avrgcc.linker.miscellaneous.LinkerFlags" value="-Wl,--relax" toolchain="avrgcc"/>
</module>
</select-by-device>
- <!-- Sourced from Atmel ASF 3.6.0, required for extensions to pass project generator validation -->
<module type="build-specific" id="common.utils.toolchain_config#uc3" caption="Toolchain configuration defaults for 32-bit AVR">
<info type="gui-flag" value="hidden"/>
<device-support value="uc3"/>
- <toolchain-config name="avr32gcc.assembler.general.AssemblerFlags" value="-mrelax" toolchain="avr32gcc"/>
+ <toolchain-config name="avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned" value="True" toolchain="avr32gcc"/>
+ <toolchain-config name="avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned" value="True" toolchain="avr32gcc"/>
<toolchain-config name="avr32gcc.compiler.optimization.OtherFlags" value="-fdata-sections" toolchain="avr32gcc"/>
<toolchain-config name="avr32gcc.compiler.optimization.PrepareFunctionsForGarbageCollection" value="True" toolchain="avr32gcc"/>
<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.compiler.miscellaneous.OtherFlags" value="-std=gnu99 -fno-strict-aliasing -Wstrict-prototypes -Wmissing-prototypes -Werror-implicit-function-declaration -Wpointer-arith -mrelax -mno-cond-exec-before-reload -fno-strict-aliasing" toolchain="avr32gcc"/>
- <toolchain-config name="avr32gcc.preprocessingassembler.general.AssemblerFlags" value="-mrelax" toolchain="avr32gcc"/>
<toolchain-config name="avr32gcc.linker.miscellaneous.LinkerFlags" value="-Wl,--relax" toolchain="avr32gcc"/>
</module>
</asf>
-</lufa> \ No newline at end of file
+</lufa>