From 2b51e4b116ea1a09126399fbbc1994f7848af495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Nohlg=C3=A5rd?= <joakim.nohlgard@eistec.se>
Date: Mon, 21 Mar 2016 07:36:02 +0100
Subject: [PATCH] newlib: Introduce newlib_nano pseudomodule

---
 Makefile.dep                         |  4 ++++
 Makefile.pseudomodules               |  1 +
 boards/msba2-common/Makefile.include |  5 +----
 cpu/Makefile.include.cortexm_common  |  5 +----
 sys/newlib/Makefile.include          | 31 ++++++++++++++++++++++------
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Makefile.dep b/Makefile.dep
index 38b315f902..6dafb9f0e1 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -290,6 +290,10 @@ ifneq (,$(filter gnrc_pktdump,$(USEMODULE)))
   USEMODULE += od
 endif
 
+ifneq (,$(filter newlib_nano,$(USEMODULE)))
+  USEMODULE += newlib
+endif
+
 ifneq (,$(filter newlib,$(USEMODULE)))
   # allow custom newlib syscalls implementations by adding
   # newlib_syscalls_XXX to USEMODULE
diff --git a/Makefile.pseudomodules b/Makefile.pseudomodules
index 52067be97b..ae55500447 100644
--- a/Makefile.pseudomodules
+++ b/Makefile.pseudomodules
@@ -17,6 +17,7 @@ PSEUDOMODULES += gnrc_pktbuf
 PSEUDOMODULES += log
 PSEUDOMODULES += log_printfnoformat
 PSEUDOMODULES += newlib
+PSEUDOMODULES += newlib_nano
 PSEUDOMODULES += pktqueue
 PSEUDOMODULES += schedstatistics
 PSEUDOMODULES += netif
diff --git a/boards/msba2-common/Makefile.include b/boards/msba2-common/Makefile.include
index 087f664bf4..5ea7992a93 100644
--- a/boards/msba2-common/Makefile.include
+++ b/boards/msba2-common/Makefile.include
@@ -29,10 +29,7 @@ export LINKFLAGS += $(CFLAGS_CPU) $(CFLAGS_DBG) $(CFLAGS_OPT) -static -lgcc -nos
 export LINKFLAGS += -Wl,--gc-sections
 
 # use the nano-specs of Newlib when available
-ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
-export CFLAGS += -specs=nano.specs
-export LINKFLAGS += -specs=nano.specs -lc -lnosys
-endif
+USEMODULE += newlib_nano
 
 ifeq ($(PORT),)
 	export PORT = /dev/ttyUSB0
diff --git a/cpu/Makefile.include.cortexm_common b/cpu/Makefile.include.cortexm_common
index 1c3fcc4ea1..6537e465ca 100644
--- a/cpu/Makefile.include.cortexm_common
+++ b/cpu/Makefile.include.cortexm_common
@@ -94,10 +94,7 @@ endif
 include $(RIOTCPU)/cortexm_common/Makefile.include
 
 # use the nano-specs of Newlib when available
-ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
-export CFLAGS += -specs=nano.specs
-export LINKFLAGS += -specs=nano.specs -lc -lnosys
-endif
+USEMODULE += newlib_nano
 
 # Avoid overriding the default rule:
 all:
diff --git a/sys/newlib/Makefile.include b/sys/newlib/Makefile.include
index 7db4d395bd..a3a06196f6 100644
--- a/sys/newlib/Makefile.include
+++ b/sys/newlib/Makefile.include
@@ -1,5 +1,18 @@
 UNDEF := $(BINDIR)newlib_syscalls_default/syscalls.o $(UNDEF)
 
+ifneq (,$(filter newlib_nano,$(USEMODULE)))
+  # Test if nano.specs is available
+  ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
+    USE_NEWLIB_NANO = 1
+  endif
+endif
+
+ifeq (1,$(USE_NEWLIB_NANO))
+  export LINKFLAGS += -specs=nano.specs
+endif
+
+export LINKFLAGS += -lc -lnosys
+
 # Search for Newlib include directories
 
 # Since Clang is not installed as a separate instance for each crossdev target
@@ -25,15 +38,21 @@ NEWLIB_INCLUDE_PATTERNS ?= \
 # the patterns above. We use the -isystem gcc/clang argument to add the include
 # directories as system include directories, which means they will not be
 # searched until after all the project specific include directories (-I/path)
-NEWLIB_INCLUDES ?= \
-    $(foreach dir, \
-        $(foreach pat, $(NEWLIB_INCLUDE_PATTERNS), $(wildcard $(pat))), \
-        -isystem $(dir))
+NEWLIB_INCLUDE_DIR ?= $(firstword $(wildcard $(NEWLIB_INCLUDE_PATTERNS)))
 
 # If nothing was found we will try to fall back to searching for a cross-gcc in
 # the current PATH and use a relative path for the includes
-ifeq (,$(NEWLIB_INCLUDES))
-  NEWLIB_INCLUDES := $(addprefix -isystem ,$(wildcard $(dir $(shell which $(PREFIX)gcc))../$(TARGET_ARCH)/include))
+ifeq (,$(NEWLIB_INCLUDE_DIR))
+  NEWLIB_INCLUDE_DIR := $(abspath $(wildcard $(dir $(shell which $(PREFIX)gcc))../$(TARGET_ARCH)/include))
+endif
+
+NEWLIB_INCLUDES := -isystem $(NEWLIB_INCLUDE_DIR)
+
+ifeq (1,$(USE_NEWLIB_NANO))
+  NEWLIB_NANO_INCLUDE_DIR ?= $(NEWLIB_INCLUDE_DIR)/nano
+  # newlib-nano overrides newlib.h and its include dir should therefore go before
+  # the regular newlib include dir.
+  NEWLIB_INCLUDES := -isystem $(NEWLIB_NANO_INCLUDE_DIR) $(NEWLIB_INCLUDES)
 endif
 
 # Newlib includes should go before GCC includes.
-- 
GitLab