From 160da3fab10d9b527d5c059dfc2d565249210a09 Mon Sep 17 00:00:00 2001 From: Marshall Culpepper <marshall@kubos.co> Date: Mon, 23 Nov 2015 10:43:42 -0600 Subject: [PATCH] cpu/cortexm_common: enable custom newlib syscalls w/ newlib_syscalls_X --- Makefile.dep | 5 +++++ sys/Makefile.include | 2 +- sys/newlib/Makefile | 2 ++ sys/newlib/Makefile.include | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index 0ff91fe2d3..6ee5f19892 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -270,6 +270,11 @@ ifneq (,$(filter gnrc_pktdump,$(USEMODULE))) endif ifneq (,$(filter newlib,$(USEMODULE))) + # allow custom newlib syscalls implementations by adding + # newlib_syscalls_XXX to USEMODULE + ifeq (,$(filter newlib_syscalls_%,$(USEMODULE))) + USEMODULE += newlib_syscalls_default + endif USEMODULE += uart_stdio endif diff --git a/sys/Makefile.include b/sys/Makefile.include index eb3523ce0e..b0f203d0c3 100644 --- a/sys/Makefile.include +++ b/sys/Makefile.include @@ -61,7 +61,7 @@ ifneq (,$(filter log_%,$(USEMODULE))) include $(RIOTBASE)/sys/log/Makefile.include endif -ifneq (,$(filter newlib,$(USEMODULE))) +ifneq (,$(filter newlib_syscalls_default,$(USEMODULE))) include $(RIOTBASE)/sys/newlib/Makefile.include endif diff --git a/sys/newlib/Makefile b/sys/newlib/Makefile index 48422e909a..586bc62601 100644 --- a/sys/newlib/Makefile +++ b/sys/newlib/Makefile @@ -1 +1,3 @@ +MODULE = newlib_syscalls_default + include $(RIOTBASE)/Makefile.base diff --git a/sys/newlib/Makefile.include b/sys/newlib/Makefile.include index 9a497e6102..28197b3279 100644 --- a/sys/newlib/Makefile.include +++ b/sys/newlib/Makefile.include @@ -1,4 +1,4 @@ -UNDEF := $(BINDIR)newlib/syscalls.o $(UNDEF) +UNDEF := $(BINDIR)newlib_syscalls_default/syscalls.o $(UNDEF) # Search for Newlib include directories -- GitLab