Skip to content

Commit 32a5a30

Browse files
cmagliecmaglie
committed
Merge branch 'update-arm-gcc' into ide-1.5.x
2 parents 350ed87 + b5bea8f commit 32a5a30

10 files changed

+72
-126
lines changed

‎build/build.xml‎

Lines changed: 65 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,27 @@
55
<!--echo message="os.version = ${os.version}" /-->
66

77
<!-- Sets properties for macosx/windows/linux depending on current system -->
8-
<condition property="macosx"><os family="mac" /></condition>
9-
<condition property="windows"><os family="windows" /></condition>
10-
<condition property="linux"><os family="unix" /></condition>
11-
<condition property="linux32"><os family="unix" arch="i386" /></condition>
12-
<condition property="linux64"><os family="unix" arch="amd64" /></condition>
13-
14-
<condition property="platform"
15-
value="macosx"><os family="mac" /></condition>
16-
<condition property="platform"
17-
value="windows"><os family="windows" /></condition>
18-
<condition property="platform"
19-
value="linux32"><os family="unix" arch="i386" /></condition>
20-
<condition property="platform"
21-
value="linux64"><os family="unix" arch="amd64" /></condition>
8+
<condition property="platform" value="macosx"><os family="mac" /></condition>
9+
<condition property="platform" value="windows"><os family="windows" /></condition>
10+
<condition property="platform" value="linux32"><os family="unix" arch="i386" /></condition>
11+
<condition property="platform" value="linux64"><os family="unix" arch="amd64" /></condition>
12+
13+
<condition property="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
14+
<condition property="windows"><equals arg1="${platform}" arg2="windows" /></condition>
15+
<condition property="linux32"><equals arg1="${platform}" arg2="linux32" /></condition>
16+
<condition property="linux64"><equals arg1="${platform}" arg2="linux64" /></condition>
17+
<condition property="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
18+
<condition property="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
19+
20+
<condition property="staging_folder" value="macosx"><equals arg1="${platform}" arg2="macosx" /></condition>
21+
<condition property="staging_folder" value="windows"><equals arg1="${platform}" arg2="windows" /></condition>
22+
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux32" /></condition>
23+
<condition property="staging_folder" value="linux"><equals arg1="${platform}" arg2="linux64" /></condition>
24+
25+
<condition property="staging_hardware_folder" value="Arduino.app/Contents/Resources/Java/hardware"><equals arg1="${platform}" arg2="macosx" /></condition>
26+
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="windows" /></condition>
27+
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux32" /></condition>
28+
<condition property="staging_hardware_folder" value="hardware"><equals arg1="${platform}" arg2="linux64" /></condition>
2229

2330
<condition property="arch-bits" value="32">
2431
<equals arg1="${platform}" arg2="linux32"/>
@@ -185,7 +192,7 @@
185192
<fail message="wrong platform (${os.name})" />
186193
</target>
187194

188-
<target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build, macosx-check-arm-toolchain" description="Build Mac OS X version">
195+
<target name="macosx-build" if="macosx" depends="revision-check, macosx-checkos, subprojects-build" description="Build Mac OS X version">
189196
<mkdir dir="macosx/work" />
190197

191198
<!-- assemble the pde -->
@@ -234,7 +241,11 @@
234241
<param name="target.path" value="macosx/work/Arduino.app/Contents/Resources/Java" />
235242
</antcall>
236243

237-
<antcall target="macosx-unzip-arm-toolchain" />
244+
<antcall target="unzip-arm-toolchain">
245+
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
246+
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz" />
247+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
248+
</antcall>
238249

239250
<delete includeEmptyDirs="true" quiet="true">
240251
<fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools" includes="**/3.4.6/**/*"/>
@@ -252,42 +263,6 @@
252263
<exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="false"/>
253264
</target>
254265

255-
<target name="macosx-check-arm-toolchain-distfile">
256-
<available file="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" property="arm_distfile_available" />
257-
</target>
258-
259-
<target name="macosx-get-arm-toolchain" depends="macosx-check-arm-toolchain-distfile" unless="arm_distfile_available">
260-
<!-- Retrieve ARM toolchain -->
261-
<get
262-
src="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz"
263-
dest="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" verbose="true" />
264-
</target>
265-
266-
<target name="macosx-check-arm-toolchain">
267-
<available file="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/g++_arm_none_eabi"
268-
property="arm_available" />
269-
</target>
270-
271-
<target name="macosx-unzip-arm-toolchain" depends="macosx-get-arm-toolchain, macosx-check-arm-toolchain" unless="arm_available">
272-
<checksum file="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" algorithm="sha"
273-
fileext=".sha" verifyproperty="checksum.matches"/>
274-
<condition property="checksum.matches.fail">
275-
<equals arg1="${checksum.matches}" arg2="false"/>
276-
</condition>
277-
<fail if="checksum.matches.fail">Checksum failed.
278-
279-
File gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz failed checksum.
280-
Please remove "macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz" to download it again.
281-
</fail>
282-
283-
<!-- ...and unzip on the destination folder -->
284-
<exec executable="tar" output="/dev/null">
285-
<arg value="xfz"/>
286-
<arg value="macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz"/>
287-
<arg value="--directory=macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/"/>
288-
</exec>
289-
</target>
290-
291266
<!-- - - - - - - - - - - - - - - - -->
292267
<!-- Sign application for MacOSX. -->
293268
<!-- - - - - - - - - - - - - - - - -->
@@ -447,7 +422,7 @@
447422
<fail message="wrong platform (${os.name})" />
448423
</target>
449424

450-
<target name="linux-build" depends="revision-check, linux-checkos, subprojects-build, linux-check-arm-toolchain" description="Build linux version">
425+
<target name="linux-build" depends="revision-check, linux-checkos, subprojects-build" description="Build linux version">
451426
<mkdir dir="linux/work" />
452427

453428
<copy todir="linux/work">
@@ -484,11 +459,16 @@
484459

485460
<copy todir="linux/work" file="linux/dist/arduino" />
486461
<chmod perm="755" file="linux/work/arduino" />
487-
488-
<antcall target="linux-unzip-arm-toolchain" />
489462
</target>
490463

491464
<target name="linux32-build" depends="linux-build" description="Build linux (32-bit) version">
465+
<!-- Unzip ARM tools -->
466+
<antcall target="unzip-arm-toolchain">
467+
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
468+
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz" />
469+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
470+
</antcall>
471+
492472
<!-- Unzip AVR tools -->
493473
<exec executable="tar" dir="linux/work/hardware">
494474
<arg value="-xjf"/>
@@ -502,67 +482,61 @@
502482

503483
<chmod perm="755" file="linux/work/hardware/tools/avrdude" />
504484

485+
<!-- Unzip ARM tools -->
486+
<antcall target="unzip-arm-toolchain">
487+
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
488+
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz" />
489+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
490+
</antcall>
491+
505492
<!-- Unzip AVR tools -->
506493
<exec executable="tar" dir="linux/work/hardware">
507494
<arg value="-xjf"/>
508495
<arg value="../../avr_tools_linux64.tar.bz2"/>
509496
</exec>
510497
</target>
511498

512-
<target name="linux32-run" depends="linux32-build"
513-
description="Run Linux (32-bit) version">
499+
<target name="linux32-run" depends="linux32-build" description="Run Linux (32-bit) version">
514500
<exec executable="./linux/work/arduino" spawn="false"/>
515501
</target>
516502

517-
<target name="linux64-run" depends="linux64-build"
518-
description="Run Linux (64-bit) version">
503+
<target name="linux64-run" depends="linux64-build" description="Run Linux (64-bit) version">
519504
<exec executable="./linux/work/arduino" spawn="false"/>
520505
</target>
521506

522-
<target name="linux-check-arm-toolchain-distfile">
523-
<available file="linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" property="arm_distfile_available" />
524-
</target>
525-
526-
<target name="linux-get-arm-toolchain" depends="linux-check-arm-toolchain-distfile" unless="arm_distfile_available">
527-
<!-- Retrieve ARM toolchain -->
528-
<get
529-
src="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz"
530-
dest="linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz"
531-
verbose="true" />
507+
<!-- Set 'arm_disfile_available' property if ARM toolchain dist_file is downloaded -->
508+
<!-- Set 'arm_toolchain_installed' property if ARM toolchain is installed in working directory -->
509+
<target name="check-arm-toolchain">
510+
<available file="${staging_folder}/dist/${dist_file}" property="arm_distfile_available" />
511+
<available file="${staging_folder}/work/hardware/tools/${dist_check_file}" property="arm_toolchain_installed" />
532512
</target>
533513

534-
<target name="linux-check-arm-toolchain">
535-
<available file="linux/work/hardware/tools/g++_arm_none_eabi" property="arm_available" />
514+
<!-- Retrieve ARM toolchain -->
515+
<target name="get-arm-toolchain" depends="check-arm-toolchain" unless="arm_distfile_available">
516+
<get src="${dist_url}" dest="${staging_folder}/dist/${dist_file}" verbose="true" />
536517
</target>
537518

538-
<target name="linux-unzip-arm-toolchain" depends="linux-get-arm-toolchain, linux-check-arm-toolchain" unless="arm_available">
539-
<checksum file="linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" algorithm="sha"
519+
<target name="unzip-arm-toolchain" depends="get-arm-toolchain, check-arm-toolchain"
520+
unless="arm_toolchain_installed">
521+
<checksum file="${staging_folder}/dist/${dist_file}" algorithm="sha"
540522
fileext=".sha" verifyproperty="checksum.matches"/>
541523
<condition property="checksum.matches.fail">
542524
<equals arg1="${checksum.matches}" arg2="false"/>
543525
</condition>
544526
<fail if="checksum.matches.fail">Checksum failed.
545527

546-
File gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz failed checksum.
547-
Please remove "linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz" to download it again.
528+
File ${dist_file} failed checksum.
529+
Please remove "${staging_folder}/dist/${dist_file}" to download it again.
548530
</fail>
549531

550532
<!-- Unzip toolchain to the destination folder -->
551533
<exec executable="tar" output="/dev/null" os="Linux">
552534
<arg value="xfz"/>
553-
<arg value="linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz"/>
554-
<arg value="--directory=linux/work/hardware/tools"/>
535+
<arg value="${staging_folder}/dist/${dist_file}"/>
536+
<arg value="--directory=${staging_folder}/work/${staging_hardware_folder}/tools/"/>
555537
</exec>
556538
</target>
557539

558-
<target name="linux64-get-arm-toolchain" depends="linux-check-arm-toolchain-distfile" unless="arm_distfile_available">
559-
<antcall target="linux-get-arm-toolchain" />
560-
</target>
561-
562-
<target name="linux64-unzip-arm-toolchain" depends="linux-get-arm-toolchain" unless="arm_available">
563-
<antcall target="linux-unzip-arm-toolchain" />
564-
</target>
565-
566540
<target name="linux-dist" depends="build"
567541
description="Build .tar.gz of linux version">
568542

@@ -704,7 +678,12 @@
704678
<fileset dir="windows/work" includes="**/*.html, **/*.dll, **/*.exe" />
705679
</chmod>
706680

707-
<antcall target="windows-unzip-arm-toolchain" />
681+
<!-- Unzip ARM toolchain -->
682+
<antcall target="unzip-arm-toolchain">
683+
<param name="dist_file" value="gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
684+
<param name="dist_url" value="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz" />
685+
<param name="dist_check_file" value="gcc-arm-none-eabi-4.7.4-2013q2" />
686+
</antcall>
708687

709688
<delete includeEmptyDirs="true" quiet="true">
710689
<fileset dir="windows/work/hardware/tools/avr/doc" />
@@ -717,42 +696,6 @@
717696
dir="windows/work" spawn="true"/>
718697
</target>
719698

720-
<target name="windows-check-arm-toolchain-distfile">
721-
<available file="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" property="arm_distfile_available" />
722-
</target>
723-
724-
<target name="windows-get-arm-toolchain" depends="windows-check-arm-toolchain-distfile" unless="arm_distfile_available">
725-
<!-- Retrieve ARM toolchain -->
726-
<get
727-
src="http://arduino.googlecode.com/files/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"
728-
dest="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"
729-
verbose="true" />
730-
</target>
731-
732-
<target name="windows-check-arm-toolchain">
733-
<available file="windows/work/hardware/tools/g++_arm_none_eabi" property="arm_available" />
734-
</target>
735-
736-
<target name="windows-unzip-arm-toolchain" depends="windows-get-arm-toolchain, windows-check-arm-toolchain" unless="arm_available">
737-
<checksum file="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" algorithm="sha"
738-
fileext=".sha" verifyproperty="checksum.matches"/>
739-
<condition property="checksum.matches.fail">
740-
<equals arg1="${checksum.matches}" arg2="false"/>
741-
</condition>
742-
<fail if="checksum.matches.fail">Checksum failed.
743-
744-
File gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz failed checksum.
745-
Please remove "windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz" to download it again.
746-
</fail>
747-
748-
<!-- Unzip toolchain to the destination folder -->
749-
<exec executable="tar">
750-
<arg value="xfz"/>
751-
<arg value="windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz"/>
752-
<arg value="--directory=windows/work/hardware/tools"/>
753-
</exec>
754-
</target>
755-
756699
<target name="windows-dist" depends="windows-build"
757700
description="Create .zip files of windows version">
758701

‎build/linux/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-linux32.tar.gz.sha‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/linux/dist/gcc-arm-none-eabi-4.7.4-2013q2-linux32.tar.gz.sha‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b35a6b9b1066977509ad5dcf51936b7a6bb18c18

‎build/linux/dist/gcc-arm-none-eabi-4.7.4-2013q2-linux64.tar.gz.sha‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
14afebbb1a26b799237080ec32b300a409ff99cb

‎build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a1326c6258f91d9b318570bc619ca8a3b799d8bc

‎build/shared/revisions.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ ARDUINO 1.5.3 BETA
77
* Added support for new 1.5 Library format (https://github.com/arduino/Arduino/wiki/Arduino-IDE-1.5:-Library-specification)
88
* Pass board type from boards.txt (https://github.com/arduino/Arduino/issues/308)
99
* Display estimated RAM usage after compile (Loren M. Lang)
10+
* Updated arm gcc to 4.7.4 and simplified build.xml
11+
* ARM gcc doesn't require ia32-libs anymore on 64 bits linux systems
1012

1113
[arduino core]
1214
* sam: Fixed delayMicrosecond() when interrupts are disabled

‎build/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎build/windows/dist/gcc-arm-none-eabi-4.7.4-2013q2-windows.tar.gz.sha‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
c41fa509205b9ced43fc221b6a0cae4223a0842d

‎hardware/arduino/sam/platform.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ version=1.5.3
1010
# SAM3 compile variables
1111
# ----------------------
1212

13-
compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
13+
compiler.path={runtime.ide.path}/hardware/tools/gcc-arm-none-eabi-4.7.4-2013q2/bin/
1414
compiler.c.cmd=arm-none-eabi-gcc
1515
compiler.c.flags=-c -g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf
1616
compiler.c.elf.cmd=arm-none-eabi-g++

0 commit comments

Comments
 (0)