Browse Source

newlib: Split newlib into one generic part and one default syscalls part

master
Joakim Nohlgård 5 years ago
parent
commit
b81b66672e
  1. 4
      makefiles/libc/newlib.mk
  2. 6
      sys/Makefile.include
  3. 2
      sys/newlib_syscalls_default/Makefile
  4. 1
      sys/newlib_syscalls_default/Makefile.include
  5. 0
      sys/newlib_syscalls_default/syscalls.c

4
sys/newlib/Makefile.include → makefiles/libc/newlib.mk

@ -1,5 +1,3 @@
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)
@ -48,7 +46,7 @@ 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_INCLUDE_DIR))
NEWLIB_INCLUDE_DIR := $(abspath $(wildcard $(dir $(shell command -v $(PREFIX)gcc;))../$(TARGET_ARCH)/include))
NEWLIB_INCLUDE_DIR := $(abspath $(wildcard $(dir $(shell command -v $(PREFIX)gcc 2>/dev/null))/../$(TARGET_ARCH)/include))
endif
ifeq ($(TOOLCHAIN),llvm)

6
sys/Makefile.include

@ -65,8 +65,12 @@ ifneq (,$(filter log_%,$(USEMODULE)))
include $(RIOTBASE)/sys/log/Makefile.include
endif
ifneq (,$(filter newlib,$(USEMODULE)))
include $(RIOTMAKE)/libc/newlib.mk
endif
ifneq (,$(filter newlib_syscalls_default,$(USEMODULE)))
include $(RIOTBASE)/sys/newlib/Makefile.include
include $(RIOTBASE)/sys/newlib_syscalls_default/Makefile.include
endif
ifneq (,$(filter arduino,$(USEMODULE)))

2
sys/newlib/Makefile → sys/newlib_syscalls_default/Makefile

@ -1,3 +1 @@
MODULE = newlib_syscalls_default
include $(RIOTBASE)/Makefile.base

1
sys/newlib_syscalls_default/Makefile.include

@ -0,0 +1 @@
UNDEF += $(BINDIR)/newlib_syscalls_default/syscalls.o

0
sys/newlib/syscalls.c → sys/newlib_syscalls_default/syscalls.c

Loading…
Cancel
Save