Staging AVR toolchain 3.6.0 (with 328pb support files)

atpack.build.bash

@@ -0,0 +1,84 @@
+#!/bin/bash -ex
+# Copyright (c) 2017 Arduino LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+source build.conf
+
+mkdir -p atpack
+cd atpack
+rm -rf *
+mv ../*.atpack .
+
+mv ${ATMEL_ATMEGA_PACK_FILENAME}.atpack ${ATMEL_ATMEGA_PACK_FILENAME}.zip
+unzip ${ATMEL_ATMEGA_PACK_FILENAME}.zip
+
+ALL_FILES=`find ../objdir`
+
+#copy relevant files to the right folders
+# 1- copy includes definitions
+EXTRA_INCLUDES=`diff -q ../objdir/avr/include/avr ../atpack/include/avr | grep "Only in" | grep atpack | cut -f4 -d" "`
+for x in $EXTRA_INCLUDES; do
+  cp include/avr/${x} ../objdir/avr/include/avr
+done
+
+# 2 - compact specs into a single folder
+SPECS_FOLDERS=`ls gcc/dev`
+mkdir temp
+for folder in $SPECS_FOLDERS; do
+  cp -r gcc/dev/${folder}/* temp/
+done
+
+# 3 - find different files (device-specs)
+EXTRA_SPECS=`diff -q ../objdir/lib/gcc/avr/${GCC_VERSION}/device-specs/ temp/device-specs | grep "Only in" | grep temp | cut -f4 -d" "`
+for x in $EXTRA_SPECS; do
+  cp temp/device-specs/${x} ../objdir/lib/gcc/avr/${GCC_VERSION}/device-specs/
+done
+
+#since https://github.com/gcc-mirror/gcc/commit/21a6b87b86defda10ac903a9cd49e34b1f8ce6fb a lot of devices has specs but avr-libc doesn't support them yet
+ALL_DEVICE_SPECS=`ls temp/device-specs`
+rm -rf temp/device-specs
+
+EXTRA_LIBS=`diff -r -q ../objdir/avr/lib temp/ | grep "Only in" | grep temp | cut -f4 -d" "`
+for x in $EXTRA_LIBS; do
+  cd temp
+  LOCATION=`find . | grep ${x}`
+  cd ..
+  cp -r temp/${LOCATION} ../objdir/avr/lib/${LOCATION}
+done
+
+# 4 - extract the correct includes and add them to io.h
+# ARGH! difficult!
+for x in $ALL_DEVICE_SPECS; do
+  DEFINITION=`cat ../objdir/lib/gcc/avr/${GCC_VERSION}/device-specs/${x} | grep __AVR_DEVICE_NAME__ | cut -f1 -d" " | cut -f2 -d"D"`
+  FANCY_NAME=`cat ../objdir/lib/gcc/avr/${GCC_VERSION}/device-specs/${x} | grep __AVR_DEVICE_NAME__ | cut -f2 -d"="`
+  LOWERCASE_DEFINITION="${DEFINITION,,}"
+  HEADER_TEMP="${LOWERCASE_DEFINITION#__avr_atmega}"
+  HEADER="${HEADER_TEMP%__}"
+  _DEFINITION="#elif defined (${DEFINITION})"
+  _HEADER="#  include <avr/iom${HEADER}.h>"
+  if [ "$(grep -c "${DEFINITION}" ../objdir/avr/include/avr/io.h)" == 0 ]; then
+    NEWFILE=`awk '/iom3000.h/ { print; print "____DEFINITION____"; print "____HEADER____"; next }1' ../objdir/avr/include/avr/io.h | sed "s/____DEFINITION____/$_DEFINITION/g" |  sed "s@____HEADER____@$_HEADER@g"`
+    echo "$NEWFILE" > ../objdir/avr/include/avr/io.h
+  fi
+done
+
+NEW_ALL_FILES=`find ../objdir`
+
+echo "NEW FILES ADDED: "
+diff  <(echo "$ALL_FILES" ) <(echo "$NEW_ALL_FILES")
+
+cd ..
+

build.conf

@@ -1,7 +1,8 @@
-AVR_VERSION=3.5.4
-BUILD_NUMBER=arduino2
+AVR_VERSION=3.6.0
+BUILD_NUMBER=arduino
 
 AVR_SOURCES="http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/${AVR_VERSION}"
+ATMEL_PACKS_SOURCES="http://packs.download.atmel.com/"
 GNU_SOURCES="http://mirror.switch.ch/ftp/mirror/gnu"
 MPC_SOURCES="http://www.multiprecision.org/mpc/download"
 
@@ -15,6 +16,10 @@ MPC_SOURCES="http://www.multiprecision.org/mpc/download"
 # MPFR_VERSION=3.0.0
 # MPC_VERSION=0.9
 
+ATMEL_ATMEGA_PACK_VERSION=1.2.132
+ATMEL_ATMEGA_PACK_FILENAME=Atmel.ATmega_DFP.${ATMEL_ATMEGA_PACK_VERSION}
+ATMEL_ATMEGA_PACK_URL=${ATMEL_PACKS_SOURCES}/${ATMEL_ATMEGA_PACK_FILENAME}.atpack
+
 # With any luck, you don't need to edit the below
 ################################################################################
 

gcc.build.bash

@@ -63,11 +63,11 @@ pushd gcc
 #cat avr-mcus.def | awk -f genmultilib.awk FORMAT="Makefile" > t-multilib 
 #popd
 pushd gcc
-for p in ../../avr-gcc-patches/*.patch
-do
-	echo Applying $p
-	patch -p1 < $p
-done
+#for p in ../../avr-gcc-patches/*.patch
+#do
+#	echo Applying $p
+#	patch -p1 < $p
+#done
 autoconf
 popd
 popd

package-avr-gcc.bash

@@ -81,6 +81,11 @@ rm -rf toolsdir objdir *-build
 
 rm -rf objdir/{info,man,share}
 
+if [[ -f ${ATMEL_ATMEGA_PACK_FILENAME}.atpack ]] ; then
+#add extra files from atpack (only if the package is altrady there)
+./atpack.build.bash
+fi
+
 # if producing a windows build, compress as zip and
 # copy *toolchain-precompiled* content to any folder containing a .exe
 if [[ ${OUTPUT_TAG} == *"mingw"* ]] ; then