From 4b477fad55ac96934b94685a46c9a4aa8264cad8 Mon Sep 17 00:00:00 2001
From: Ayke van Laethem <aykevanlaethem@gmail.com>
Date: Sat, 2 Feb 2019 10:45:11 +0100
Subject: [PATCH] all: update Travis CI to Ubuntu Xenial

This lets us test with a more recent base, and should fix various
issues.
---
 .travis.yml           | 29 ++++++++++++++++++++---------
 targets/nrf52.json    |  1 +
 targets/nrf52840.json |  1 +
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 629d72b3..a36e493b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,24 @@
 language: go
 
-go:
-  - "1.11"
+matrix:
+  include:
+  - dist: xenial
+    go: "1.11"
 
-before_install:
-  - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-7 main"            | sudo tee -a /etc/apt/sources.list
-  - echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list
-  - sudo apt-get update -qq
-  - sudo apt-get install llvm-7-dev clang-7 libclang-7-dev binutils-arm-none-eabi qemu-system-arm --allow-unauthenticated -y
-  - sudo ln -s /usr/bin/clang-7 /usr/local/bin/cc # work around missing -no-pie in old GCC version
+addons:
+  apt:
+    sources:
+    - sourceline: 'ppa:ubuntu-toolchain-r'
+    - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main'
+      key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
+    packages:
+    - llvm-7-dev
+    - clang-7
+    - libclang-7-dev
+    - binutils-arm-none-eabi
+    - qemu-system-arm
+    - gcc-avr
+    - avr-libc
 
 install:
   - curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
@@ -26,7 +36,8 @@ script:
   - tinygo build -o test.nrf.elf       -target=nrf52840-mdk examples/blinky1
   - tinygo build -o blinky1.nrf51d.elf -target=pca10031     examples/blinky1
   - tinygo build -o blinky1.stm32.elf  -target=bluepill     examples/blinky1
-  - tinygo build -o blinky1.avr.o      -target=arduino      examples/blinky1 # TODO: avr-as/avr-gcc doesn't work
+  - tinygo build -o blinky1.avr.elf    -target=arduino      examples/blinky1
+  - tinygo build -o blinky1.avr.elf    -target=digispark    examples/blinky1
   - tinygo build -o blinky1.reel.elf   -target=reelboard    examples/blinky1
   - tinygo build -o blinky2.reel.elf   -target=reelboard    examples/blinky2
   - tinygo build -o blinky1.pca10056.elf    -target=pca10056     examples/blinky1
diff --git a/targets/nrf52.json b/targets/nrf52.json
index 6eeaf651..46bf567e 100644
--- a/targets/nrf52.json
+++ b/targets/nrf52.json
@@ -4,6 +4,7 @@
 	"build-tags": ["nrf52", "nrf"],
 	"cflags": [
 		"--target=armv7em-none-eabi",
+		"-mfloat-abi=soft",
 		"-Qunused-arguments",
 		"-DNRF52832_XXAA",
 		"-Ilib/CMSIS/CMSIS/Include"
diff --git a/targets/nrf52840.json b/targets/nrf52840.json
index d49a1f0a..10a3cbbc 100644
--- a/targets/nrf52840.json
+++ b/targets/nrf52840.json
@@ -4,6 +4,7 @@
 	"build-tags": ["nrf52840", "nrf"],
 	"cflags": [
 		"--target=armv7em-none-eabi",
+		"-mfloat-abi=soft",
 		"-Qunused-arguments",
 		"-DNRF52840_XXAA",
 		"-Ilib/CMSIS/CMSIS/Include"