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 01/11] 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 b852e8742bf..d767249cd75 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 53c9aaf591b..c9a6e84d31c 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 62a78b76735..00000000000
--- 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 ba1b5c7e884..00000000000
--- 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 3c333ee784c..00000000000
--- 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 00000000000..564bd884bec
--- /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 00000000000..638a81cb6c2
--- /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 00000000000..b72f565de69
--- /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 6d87ebcafe9..00000000000
--- 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 0bc23f68811..00000000000
--- 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 e4b0302e0fa..00000000000
--- 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 00000000000..d25b024761f
--- /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 00000000000..390d6dfb229
--- /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 00000000000..73120144add
--- /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 a0ac6d486d0..00000000000
--- 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 00000000000..15399238c4f
--- /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 359455e692d..00000000000
--- 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 3b1625eee60..00000000000
--- 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 00000000000..9fddf9027cb
--- /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 34509a5aa5d..00000000000
--- 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 00000000000..a95154f9b78
--- /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 e55aa9d558b..00000000000
--- 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 00000000000..1abe3921fc1
--- /dev/null
+++ b/build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha
@@ -0,0 +1 @@
+290557c99c63a8c53dec67acc1719687f0f8c6a3

From dda93de5f7f7fffa1ac37434f04a7783d6f301d3 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 7 Jun 2016 18:11:19 +0200
Subject: [PATCH 02/11] update revision log

---
 build/shared/revisions.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index 2f53598521d..ec70a563792 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -12,6 +12,9 @@ ARDUINO 1.6.10
 * Solved a bug that crashed the IDE with some exotic serial devices
 
 [core]
+* avr: toolchain updated to latest Atmel release 3.5.2 http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.5.2/
+  The updated tools are now binutils-2.26, gcc-4.9.2, avr-libc-2.0.0, gdb-7.8
+* avr: avrdude updated to version 6.3
 * fixed a small bug that caused a compile error on some 3rd party derivatives boards based on Leonardo
 * sam: added snprintf_P to avr/pgmspace.h stub. Thanks @jantje
 * avr: Fix TX buffer being overwritten by multiple Wire.write(...) calls in slave mode. Thanks @kellerkindt

From 5a01929b8fdc10dfca974d83bb8065696384f1ec Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 7 Jun 2016 23:01:00 +0200
Subject: [PATCH 03/11] avrdude 6.3: fixed IDE build for macosx

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

diff --git a/build/build.xml b/build/build.xml
index c9a6e84d31c..d0ec28b97ee 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1199,11 +1199,11 @@
 
   <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
     <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb.dylib"/>
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb.dylib"/>
       <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
     </exec>
     <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude-6.0.1/lib/libusb-1.0.dylib"/>
+      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb-1.0.dylib"/>
       <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
     </exec>
   </target>

From f5fd6423c3df9423bf285306b761f3a54d918dcf Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 14 Jun 2016 19:27:10 +0200
Subject: [PATCH 04/11] Updated avrdude to 6.3-arduino2

---
 build/build.xml                                                 | 2 +-
 build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha  | 1 -
 build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha   | 1 -
 build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 .../linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha  | 1 +
 .../avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 +
 .../macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha  | 1 -
 .../avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha      | 1 +
 build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha  | 1 -
 .../windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha | 1 +
 11 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha
 create mode 100644 build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha

diff --git a/build/build.xml b/build/build.xml
index d0ec28b97ee..be08579b323 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -92,7 +92,7 @@
   <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" />
+  <property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">
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
deleted file mode 100644
index d25b024761f..00000000000
--- a/build/linux/avrdude-6.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 390d6dfb229..00000000000
--- a/build/linux/avrdude-6.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 73120144add..00000000000
--- a/build/linux/avrdude-6.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-5da144bfa6cdd723bcbb34b1d7cf54fc4ff85181
diff --git a/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..389ab1832ad
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+a074c17e2013942e3e081fe03875c9d5701a0922
diff --git a/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..844fb6a27cc
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino2-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+e9ce49f5e5c7d0d2eabd9405ca6160b70cd52645
diff --git a/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..1104a38421e
--- /dev/null
+++ b/build/linux/avrdude-6.3.0-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+3ba4c2660f8a8c40ba3902ab8a158aa3e1b91764
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
deleted file mode 100644
index 9fddf9027cb..00000000000
--- a/build/macosx/avrdude-6.3-arduino-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-69313a235a017a58d547840f7bcb3a9d8f730427
diff --git a/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..edb160cf3ea
--- /dev/null
+++ b/build/macosx/avrdude-6.3.0-arduino2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+39a1940fbb4a25af5316d9a6bde99b6a29585e37
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
deleted file mode 100644
index 1abe3921fc1..00000000000
--- a/build/windows/avrdude-6.3-arduino-i686-w64-mingw32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-290557c99c63a8c53dec67acc1719687f0f8c6a3
diff --git a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha
new file mode 100644
index 00000000000..2fa33062937
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha
@@ -0,0 +1 @@
+3aa66a7f485bc4eae5eb8f8ce1140950607e8490

From e3079871d7dfaed076ca9044e2ef1df6a0510246 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 14 Jun 2016 19:28:12 +0200
Subject: [PATCH 05/11] Gatekeeper workaround is no more needed with avrdude
 linked statically

See:

https://github.com/arduino/avrdude-build-script/commit/2db1e51b87d49639615c30a662cefc1fcbbd6e35
https://github.com/arduino/avrdude-build-script/commit/960dfb99e4f904fe1c0684fd0165cc25c2247562
---
 build/build.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index be08579b323..f38e1e35228 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -502,11 +502,6 @@
       <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/*"/>
       <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/libexec/gcc/avr/4.8.1/*"/>
     </chmod>
-
-    <!-- macosx gatekeeper workaround. See https://github.com/arduino/Arduino/issues/3468 -->
-    <chmod perm="-x">
-      <fileset dir="${staging_folder}/work/${staging_hardware_folder}/tools" includes="**/bin/avrdude_bin" />
-    </chmod>
   </target>
 
   <target name="macosx-run" depends="build,start"/>

From ba0c41b93de8823b345b6b10b06bee49054583eb Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 14 Jun 2016 19:31:52 +0200
Subject: [PATCH 06/11] Added -fpermissive flag.

This avoid build errors on old libraries. It may possibly be removed in
the future after a period of transition.
---
 hardware/arduino/avr/platform.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 50778f1d14f..156f4dfdcfa 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -25,7 +25,7 @@ compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections
 compiler.c.elf.cmd=avr-gcc
 compiler.S.flags=-c -g -x assembler-with-cpp
 compiler.cpp.cmd=avr-g++
-compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD
+compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD
 compiler.ar.cmd=avr-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=avr-objcopy

From 10182f2f02e67de8752d5430cd3d9116c58d5e76 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 16 Jun 2016 14:01:33 +0200
Subject: [PATCH 07/11] Update avr-gcc to 4.9.2-arduino2

---
 build/build.xml                                                 | 2 +-
 .../linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha  | 1 -
 build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 .../linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha  | 1 +
 .../avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 +
 .../avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha       | 1 -
 .../avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha      | 1 +
 build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha    | 1 -
 build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha   | 1 +
 11 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha
 create mode 100644 build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha

diff --git a/build/build.xml b/build/build.xml
index f38e1e35228..c4254efa0ab 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,7 +91,7 @@
 
   <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="AVRGCC-VERSION" value="4.9.2-arduino2" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
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
deleted file mode 100644
index 564bd884bec..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 638a81cb6c2..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b72f565de69..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8e197612de355492863e0c16e5f7eff613ece664
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..542954054cc
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+117364326d47da17a3cbc4cb49ac149f71dde508
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..cde4ec21aea
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+e247b77eef43423e19680b60fa65bdf22b20f4f5
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..d96a4cae0e4
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+ebe696926990906e573a04b5fa1b71dba7ef5925
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
deleted file mode 100644
index 15399238c4f..00000000000
--- a/build/macosx/avr-gcc-4.9.2-arduino-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-8c50de1eb21d9df37418ec6bd3aec691fc1d7bb0
diff --git a/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..f47aedb7b1c
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+73cd96b9183ae51f1b727eb15130b22a52228b18
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
deleted file mode 100644
index a95154f9b78..00000000000
--- a/build/windows/avr-gcc-4.9.2-arduino-i686-mingw32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-c6c59c2846a84196cd18b58635916cd4fe73eb39
diff --git a/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha b/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha
new file mode 100644
index 00000000000..f82d2d9c3fc
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha
@@ -0,0 +1 @@
+60c91c757a8dd4f1523120a2b3a1a4b7630f80f5

From 385edd26fc2b64a442130f2f6a63e22416621857 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 16 Jun 2016 14:01:45 +0200
Subject: [PATCH 08/11] Removed "macosx-fix-bundled-toolchain-missing-symlinks"
 build task

This is no more needed since avrdude is compiled with libusb*
statically linked
---
 build/build.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index c4254efa0ab..c5b8803a0d9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -1162,7 +1162,6 @@
 
     <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" 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}"/>
     <echo append="true" file="${staging_folder}/work/${staging_hardware_folder}/tools/avr/builtin_tools_versions.txt" message="arduino.avr-gcc=${gcc_version}${line.separator}"/>
@@ -1192,17 +1191,6 @@
     <delete dir="${staging_folder}/work/${staging_hardware_folder}/tmp"/>
   </target>
 
-  <target name="macosx-fix-bundled-toolchain-missing-symlinks" if="macosx">
-    <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb.dylib"/>
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
-    </exec>
-    <exec executable="mv" failonerror="true">
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tmp/avrdude/avrdude/lib/libusb-1.0.dylib"/>
-      <arg value="${staging_folder}/work/${staging_hardware_folder}/tools/avr/lib/"/>
-    </exec>
-  </target>
-
   <target name="generate-hourly-build-txt" if="hourly">
     <echo file="${staging_folder}/work/${staging_hardware_folder}/../lib/hourlyBuild.txt">${BUILD_DATE}</echo>
   </target>

From 4cf3278ee0629151cedef6445e02722da1879737 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Thu, 16 Jun 2016 13:05:24 +0200
Subject: [PATCH 09/11] Enable LTO

---
 hardware/arduino/avr/platform.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 156f4dfdcfa..432650e4fbe 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -20,13 +20,13 @@ compiler.warning_flags.all=-Wall -Wextra
 # Default "compiler.path" is correct, change only if you want to override the initial value
 compiler.path={runtime.tools.avr-gcc.path}/bin/
 compiler.c.cmd=avr-gcc
-compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD
-compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections
+compiler.c.flags=-c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -MMD -flto -fno-fat-lto-objects
+compiler.c.elf.flags={compiler.warning_flags} -Os -Wl,--gc-sections -flto -fuse-linker-plugin
 compiler.c.elf.cmd=avr-gcc
-compiler.S.flags=-c -g -x assembler-with-cpp
+compiler.S.flags=-c -g -x assembler-with-cpp -flto
 compiler.cpp.cmd=avr-g++
-compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD
-compiler.ar.cmd=avr-ar
+compiler.cpp.flags=-c -g -Os {compiler.warning_flags} -std=gnu++11 -fpermissive -fno-exceptions -ffunction-sections -fdata-sections -fno-threadsafe-statics -MMD -flto
+compiler.ar.cmd=avr-gcc-ar
 compiler.ar.flags=rcs
 compiler.objcopy.cmd=avr-objcopy
 compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,load --no-change-warnings --change-section-lma .eeprom=0

From f13af22abe781e1b0678a8a94f1cd33766c1ac2d Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Wed, 22 Jun 2016 16:24:13 +0200
Subject: [PATCH 10/11] Update avr-gcc to 4.9.2-arduino4

---
 build/build.xml                                           | 8 ++++----
 .../avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha | 1 -
 .../avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha  | 1 -
 ...avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha | 1 -
 .../avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 .../avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha  | 1 +
 ...avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha | 1 +
 ...avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha | 1 -
 ...avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha | 1 +
 .../avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha       | 1 -
 build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha | 1 +
 .../avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha   | 1 -
 .../avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha       | 1 +
 13 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha
 create mode 100644 build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
 delete mode 100644 build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha
 create mode 100644 build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index c5b8803a0d9..8919df798b0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,7 +91,7 @@
 
   <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-arduino2" />
+  <property name="AVRGCC-VERSION" value="4.9.2-arduino4" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
@@ -1068,10 +1068,10 @@
 
   <target name="windows-build-avr-toolchain">
     <antcall target="avr-toolchain-bundle">
-      <param name="unpack_target" value="untar"/>
-      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.tar.bz2"/>
+      <param name="unpack_target" value="unzip"/>
+      <param name="gcc_archive_file" value="avr-gcc-${AVRGCC-VERSION}-i686-mingw32.zip"/>
       <param name="gcc_version" value="${AVRGCC-VERSION}"/>
-      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.tar.bz2"/>
+      <param name="avrdude_archive_file" value="avrdude-${AVRDUDE-VERSION}-i686-w64-mingw32.zip"/>
       <param name="avrdude_version" value="${AVRDUDE-VERSION}"/>
     </antcall>
 
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 542954054cc..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino2-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-117364326d47da17a3cbc4cb49ac149f71dde508
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index cde4ec21aea..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino2-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-e247b77eef43423e19680b60fa65bdf22b20f4f5
diff --git a/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index d96a4cae0e4..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino2-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-ebe696926990906e573a04b5fa1b71dba7ef5925
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..75a89a6bd63
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+3f8207df94b899ab1bc07e93d0e226113554466b
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..d8c24e8d492
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+4b787466bd6ebf6ed9d54f58b984de51dd05f014
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..01094f168b3
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+cdf1df744b67f475ea625906690b3a32614c8534
diff --git a/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index f47aedb7b1c..00000000000
--- a/build/macosx/avr-gcc-4.9.2-arduino2-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-73cd96b9183ae51f1b727eb15130b22a52228b18
diff --git a/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..6573e58ff18
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+b065f135e6acaf88fba4591151dd3586f55583df
diff --git a/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha b/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha
deleted file mode 100644
index f82d2d9c3fc..00000000000
--- a/build/windows/avr-gcc-4.9.2-arduino2-i686-mingw32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-60c91c757a8dd4f1523120a2b3a1a4b7630f80f5
diff --git a/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
new file mode 100644
index 00000000000..08ae233f261
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+78db4cafa5c950ec2c14f98ff14927ad8bfc7397
diff --git a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha
deleted file mode 100644
index 2fa33062937..00000000000
--- a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-3aa66a7f485bc4eae5eb8f8ce1140950607e8490
diff --git a/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha
new file mode 100644
index 00000000000..9b9d3b373ff
--- /dev/null
+++ b/build/windows/avrdude-6.3.0-arduino2-i686-w64-mingw32.zip.sha
@@ -0,0 +1 @@
+5eaea443fd51515e1b51790a180b35e7f0949b30

From cc4c10c66223424c61c3eb305f8863c2fe6ac5ec Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Wed, 20 Jul 2016 15:44:32 +0200
Subject: [PATCH 11/11] Update avr-gcc to 4.9.2-atmel-3.5.3-arduino

The avr toolchain has been updated to the Atmel bundle version 3.5.3
---
 build/build.xml                                                 | 2 +-
 .../linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha | 1 -
 .../linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha  | 1 -
 .../avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha      | 1 -
 ...-gcc-4.9.2-atmel3.5.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha | 1 +
 ...r-gcc-4.9.2-atmel3.5.3-arduino-i686-pc-linux-gnu.tar.bz2.sha | 1 +
 ...gcc-4.9.2-atmel3.5.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha | 1 +
 .../avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha      | 1 -
 ...gcc-4.9.2-atmel3.5.3-arduino-i386-apple-darwin11.tar.bz2.sha | 1 +
 build/shared/revisions.txt                                      | 2 +-
 build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha       | 1 -
 .../avr-gcc-4.9.2-atmel3.5.3-arduino-i686-mingw32.zip.sha       | 1 +
 12 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
 create mode 100644 build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
 delete mode 100644 build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
 create mode 100644 build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino-i386-apple-darwin11.tar.bz2.sha
 delete mode 100644 build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
 create mode 100644 build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-mingw32.zip.sha

diff --git a/build/build.xml b/build/build.xml
index 8919df798b0..dc297162e83 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -91,7 +91,7 @@
 
   <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-arduino4" />
+  <property name="AVRGCC-VERSION" value="4.9.2-atmel3.5.3-arduino" />
   <property name="AVRDUDE-VERSION" value="6.3.0-arduino2" />
 
   <!-- Libraries required for running arduino -->
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 75a89a6bd63..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino4-armhf-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-3f8207df94b899ab1bc07e93d0e226113554466b
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index d8c24e8d492..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino4-i686-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-4b787466bd6ebf6ed9d54f58b984de51dd05f014
diff --git a/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
deleted file mode 100644
index 01094f168b3..00000000000
--- a/build/linux/avr-gcc-4.9.2-arduino4-x86_64-pc-linux-gnu.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-cdf1df744b67f475ea625906690b3a32614c8534
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..409ec55d88c
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-armhf-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+9b6e398caf779bdac5e2666c1aac99b481b49490
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..8b6dfcf26bf
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+4f20340c804da0218d6840983bbe6d84fb7e4b9a
diff --git a/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
new file mode 100644
index 00000000000..89b39207d42
--- /dev/null
+++ b/build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino-x86_64-pc-linux-gnu.tar.bz2.sha
@@ -0,0 +1 @@
+40825882ad0a725c3d500b8fa7ef4c8a72ed7613
diff --git a/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
deleted file mode 100644
index 6573e58ff18..00000000000
--- a/build/macosx/avr-gcc-4.9.2-arduino4-i386-apple-darwin11.tar.bz2.sha
+++ /dev/null
@@ -1 +0,0 @@
-b065f135e6acaf88fba4591151dd3586f55583df
diff --git a/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino-i386-apple-darwin11.tar.bz2.sha b/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino-i386-apple-darwin11.tar.bz2.sha
new file mode 100644
index 00000000000..9d99dad4cef
--- /dev/null
+++ b/build/macosx/avr-gcc-4.9.2-atmel3.5.3-arduino-i386-apple-darwin11.tar.bz2.sha
@@ -0,0 +1 @@
+9c19956324bcee6818858489dd699949363934f7
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
index ec70a563792..0715150eb72 100644
--- a/build/shared/revisions.txt
+++ b/build/shared/revisions.txt
@@ -12,7 +12,7 @@ ARDUINO 1.6.10
 * Solved a bug that crashed the IDE with some exotic serial devices
 
 [core]
-* avr: toolchain updated to latest Atmel release 3.5.2 http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.5.2/
+* avr: toolchain updated to latest Atmel release 3.5.3 http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.5.3/
   The updated tools are now binutils-2.26, gcc-4.9.2, avr-libc-2.0.0, gdb-7.8
 * avr: avrdude updated to version 6.3
 * fixed a small bug that caused a compile error on some 3rd party derivatives boards based on Leonardo
diff --git a/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
deleted file mode 100644
index 08ae233f261..00000000000
--- a/build/windows/avr-gcc-4.9.2-arduino4-i686-mingw32.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-78db4cafa5c950ec2c14f98ff14927ad8bfc7397
diff --git a/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-mingw32.zip.sha b/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-mingw32.zip.sha
new file mode 100644
index 00000000000..c1651bb94ac
--- /dev/null
+++ b/build/windows/avr-gcc-4.9.2-atmel3.5.3-arduino-i686-mingw32.zip.sha
@@ -0,0 +1 @@
+ecc62d844aaf725eddd1093fb6526bc977a464a5