From 05b647721cec48f1b6663688b61f4408539795a1 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Fri, 3 Jun 2016 16:45:11 +0200
Subject: [PATCH] Update avr-gcc to 4.9.2 and avrdude to 6.3

---
 .gitignore                                    |  1 +
 build/build.xml                               | 46 ++++++++++---------
 ...5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha |  1 -
 ...8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ...9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha |  1 +
 ....9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ....2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 ...5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha |  1 -
 ...0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha |  1 -
 ...1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha |  1 -
 ...6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha |  1 +
 ...-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha |  1 +
 ....3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha |  1 +
 ...1-arduino5-i386-apple-darwin11.tar.bz2.sha |  1 -
 ....2-arduino-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...1-arduino5-i386-apple-darwin11.tar.bz2.sha |  1 -
 ...rduino5-r2-i386-apple-darwin11.tar.bz2.sha |  1 -
 ....3-arduino-i386-apple-darwin11.tar.bz2.sha |  1 +
 ...vr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha |  1 -
 ...gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha |  1 +
 ...vrdude-6.0.1-arduino5-i686-mingw32.zip.sha |  1 -
 ...e-6.3-arduino-i686-w64-mingw32.tar.bz2.sha |  1 +
 23 files changed, 35 insertions(+), 33 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
 create mode 100644 build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
 create mode 100644 build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha

diff --git a/.gitignore b/.gitignore
index b852e8742..d767249cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ build/*.tar.bz2
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
+build/windows/*.tar.bz2
 build/windows/libastylej*
 build/windows/arduino-*.zip
 build/windows/dist/*.tar.gz
diff --git a/build/build.xml b/build/build.xml
index 53c9aaf59..c9a6e84d3 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,6 +91,8 @@
 
   <property name="ARDUINO-BUILDER-VERSION" value="1.3.19" />
   <property name="LIBLISTSERIAL-VERSION" value="1.1.3" />
+  <property name="AVRGCC-VERSION" value="4.9.2-arduino" />
+  <property name="AVRDUDE-VERSION" value="6.3-arduino" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
@@ -490,10 +492,10 @@
   <target name="macosx-build-avr-toolchain" unless="light_bundle">
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i386-apple-darwin11.tar.bz2"/>
+      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i386-apple-darwin11.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <chmod perm="+x">
@@ -720,10 +722,10 @@
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-armhf-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -752,10 +754,10 @@
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -784,10 +786,10 @@
 
     <antcall target="avr-toolchain-bundle">
       <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-x86_64-pc-linux-gnu.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -1071,11 +1073,11 @@
 
   <target name="windows-build-avr-toolchain">
     <antcall target="avr-toolchain-bundle">
-      <param name="unpack_target" value="unzip"/>
-      <param name="gcc_archive_file" value="avr-gcc-4.8.1-arduino5-i686-mingw32.zip"/>
-      <param name="gcc_version" value="4.8.1-arduino5"/>
-      <param name="avrdude_archive_file" value="avrdude-6.0.1-arduino5-i686-mingw32.zip"/>
-      <param name="avrdude_version" value="6.0.1-arduino5"/>
+      <param name="unpack_target" value="untar"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.tar.bz2"/>
+      <param name="gcc_version" value="${AVRGCC-VERSION}"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.tar.bz2"/>
+      <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
     <antcall target="package-library-index-json-bundle"/>
@@ -1164,7 +1166,7 @@
     </antcall>
 
     <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/gcc/avr" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
-    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
+    <move file="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude" tofile="${staging_folder}/work/${staging_hardware_folder}/tools/avr"/>
     <antcall target="macosx-fix-bundled-toolchain-missing-symlinks"/>
 
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avrdude=${avrdude_version}${line.separator}"/>
diff --git a/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
deleted file mode 100644
index 62a78b767..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-220662c5411e34dd1e16c181f883b6b77824a942
diff --git a/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index ba1b5c7e8..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-fdd09172450c3970a55e1876d1fc112d0db626ac
diff --git a/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 3c333ee78..000000000
--- a/build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-0398e498559c42e45cb98ba13251da7e5b306e0c
diff --git a/build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..564bd884b
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+bf2f87bf19613b5bc89c599495acd3edbb7883d1
diff --git a/build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..638a81cb6
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+f6004cc4a2b36a1db65acf011d1d2c9e352859fd
diff --git a/build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..b72f565de
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+8e197612de355492863e0c16e5f7eff613ece664
diff --git a/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
deleted file mode 100644
index 6d87ebcaf..000000000
--- a/build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu-glibc2.13.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b5968416647e79f5c395bf2a9ba000127dacc9da
diff --git a/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 0bc23f688..000000000
--- a/build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cf859c679713cae2f1b9089d797d211dd84fe658
diff --git a/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index e4b0302e0..000000000
--- a/build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cfc52036f532c3a7050f6d4ec7645d060800aa39
diff --git a/build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..d25b02476
--- /dev/null
+++ b/build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+709fe71fc92f1bf41b55f5f0e7fde11c4a0f2258
diff --git a/build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..390d6dfb2
--- /dev/null
+++ b/build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+cd3c6f573f015f3f907e0cf385bc688a7bca68fb
diff --git a/build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 000000000..73120144a
--- /dev/null
+++ b/build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+5da144bfa6cdd723bcbb34b1d7cf54fc4ff85181
diff --git a/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index a0ac6d486..000000000
--- a/build/macosx/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-1ea737a217e0dde0a338fff070cc3010669ab6f1
diff --git a/build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..15399238c
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+8c50de1eb21d9df37418ec6bd3aec691fc1d7bb0
diff --git a/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 359455e69..000000000
--- a/build/macosx/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-1eb447a6c11f374d71e91bf4c381380216f9a476
diff --git a/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 3b1625eee..000000000
--- a/build/macosx/avrdude-6.0.1-arduino5-r2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-52afce6cbe1cc1021bca1234cf25b298350f97dd
diff --git a/build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 000000000..9fddf9027
--- /dev/null
+++ b/build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+69313a235a017a58d547840f7bcb3a9d8f730427
diff --git a/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
deleted file mode 100644
index 34509a5aa..000000000
--- a/build/windows/avr-gcc-4.8.1-arduino5-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-da0805de78417c51001d8f609ae7d8ef320425b9
diff --git a/build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha b/build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha
new file mode 100644
index 000000000..a95154f9b
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha
@@ -0,0 +1 @@
+c6c59c2846a84196cd18b58635916cd4fe73eb39
diff --git a/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha b/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
deleted file mode 100644
index e55aa9d55..000000000
--- a/build/windows/avrdude-6.0.1-arduino5-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-bad246afeb0b9bcbe623a29cb204127f901102cf
diff --git a/build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha b/build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha
new file mode 100644
index 000000000..1abe3921f
--- /dev/null
+++ b/build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha
@@ -0,0 +1 @@
+290557c99c63a8c53dec67acc1719687f0f8c6a3