From d350aa4dd72841355a174d548aea9a22d2b052fd Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Mon, 16 Feb 2015 14:47:43 -0500 Subject: [PATCH 1/2] Fix aducrf101 builds with GCC 4.9+ Mixing LTO and libraries requires the use of gcc-ar instead of ar. See https://gcc.gnu.org/wiki/LinkTimeOptimizationFAQ?action=recall&rev=5#ar.2C_nm_and_ranlib --- cpu/arm/aducrf101/Makefile.aducrf101.gnu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/arm/aducrf101/Makefile.aducrf101.gnu b/cpu/arm/aducrf101/Makefile.aducrf101.gnu index 93de277a2..bafb06aa9 100644 --- a/cpu/arm/aducrf101/Makefile.aducrf101.gnu +++ b/cpu/arm/aducrf101/Makefile.aducrf101.gnu @@ -39,8 +39,8 @@ CROSS_COMPILE = arm-none-eabi- CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)gcc AS = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar -NM = $(CROSS_COMPILE)nm +AR = $(CROSS_COMPILE)gcc-ar +NM = $(CROSS_COMPILE)gcc-nm OBJCOPY = $(CROSS_COMPILE)objcopy OBJDUMP = $(CROSS_COMPILE)objdump STRIP = $(CROSS_COMPILE)strip From fba2e2020aeca4db76fa2be36d6b1047ea417130 Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Mon, 16 Feb 2015 14:52:29 -0500 Subject: [PATCH 2/2] Re-enable ev-aducrf101mkxz travis tests --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bb3900287..386829b5d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -115,6 +115,6 @@ env: - BUILD_TYPE='compile-8051-ports' BUILD_CATEGORY='compile' BUILD_ARCH='8051' - BUILD_TYPE='compile-arm-apcs-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm-apcs' - BUILD_TYPE='compile-6502-ports' BUILD_CATEGORY='compile' BUILD_ARCH='6502' -# - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm' + - BUILD_TYPE='compile-arm-ports' BUILD_CATEGORY='compile' BUILD_ARCH='arm' - BUILD_TYPE='slip-radio' MAKE_TARGETS='cooja' - BUILD_TYPE='llsec' MAKE_TARGETS='cooja'