RIOT-OS · kaspar030 · Mar 7, 2017 · Aug 17, 2016 · Nov 6, 2017 · Nov 14, 2017
diff --git a/Makefile.include b/Makefile.include
@@ -313,7 +313,7 @@ LINKFLAGPREFIX ?= -Wl,
 
 DIRS += $(EXTERNAL_MODULE_DIRS)
 
-_LINK = $(if $(CPPMIX),$(LINKXX),$(LINK)) $(UNDEF) $(LINKFLAGPREFIX)--start-group $(BASELIBS) -lm $(LINKFLAGPREFIX)--end-group  $(LINKFLAGPREFIX)-Map=$(BINDIR)/$(APPLICATION).map $(LINKFLAGS)
+_LINK = $(if $(CPPMIX),$(LINKXX),$(LINK)) $(UNDEF) $(LINKFLAGPREFIX)--whole-archive $(LINKFLAGPREFIX)--start-group $(filter-out $(EXTRA_LIBS),$(BASELIBS)) -lm $(LINKFLAGPREFIX)--end-group $(LINKFLAGPREFIX)--no-whole-archive $(LINKFLAGPREFIX)-Map=$(BINDIR)/$(APPLICATION).map $(EXTRA_LIBS) $(LINKFLAGS)
 
 ifeq ($(BUILD_IN_DOCKER),1)
 link: ..in-docker-container

diff --git a/boards/common/msba2/Makefile.include b/boards/common/msba2/Makefile.include
@@ -31,6 +31,4 @@ INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include
 
 export OFLAGS = -O ihex
 
-export UNDEF += $(BINDIR)/cpu/startup.o
-
 USEMODULE += boards_common_msba2-drivers
diff --git a/boards/native/Makefile.include b/boards/native/Makefile.include
@@ -185,5 +185,3 @@ eval-gprof:
 
 eval-cachegrind:
 	$(CGANNOTATE) $(shell ls -rt cachegrind.out* | tail -1)
-
-export UNDEF += $(BINDIR)/cpu/startup.o
@@ -4,9 +4,5 @@ USEMODULE += atmega_common
 # define path to atmega common module, which is needed for this CPU
 export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
 
-# explicitly tell the linker to link the syscalls and startup code.
-#   Without this the interrupt vectors will not be linked correctly!
-export UNDEF += $(BINDIR)/cpu/startup.o
-
 # CPU depends on the atmega common module, so include it
 include $(ATMEGA_COMMON)Makefile.include
@@ -4,9 +4,5 @@ USEMODULE += atmega_common
 # define path to atmega common module, which is needed for this CPU
 export ATMEGA_COMMON = $(RIOTCPU)/atmega_common/
 
-# explicitly tell the linker to link the syscalls and startup code.
-#   Without this the interrupt vectors will not be linked correctly!
-export UNDEF += $(BINDIR)/cpu/startup.o
-
 # CPU depends on the atmega common module, so include it
 include $(ATMEGA_COMMON)Makefile.include
@@ -357,6 +357,8 @@ typedef struct {
     timer_dev_t timer;      /**< the higher numbered timer */
     IRQn_Type irq;          /**< number of the higher timer IRQ channel */
 } timer_conf_t;
+
+#define PERIPH_TIMER_PROVIDES_SET
 /** @} */
 
 /**

diff --git a/cpu/kinetis/Makefile.include b/cpu/kinetis/Makefile.include
@@ -30,9 +30,6 @@ LINKFLAGS += $(LINKFLAGPREFIX)--defsym=_ram_start_addr=$(RAM_START_ADDR)
 LINKFLAGS += $(LINKFLAGPREFIX)--defsym=_rom_length=$(ROM_LEN)
 LINKFLAGS += $(LINKFLAGPREFIX)--defsym=_ram_length=$(RAM_LEN)
 
-# add the CPU specific flash configuration field for the linker
-export UNDEF += $(BINDIR)/cpu/fcfield.o
-
 # include common periph drivers
 USEMODULE += periph_common
 

diff --git a/cpu/mips32r2_common/Makefile.include b/cpu/mips32r2_common/Makefile.include
@@ -12,6 +12,7 @@ ifeq ($(USE_UHI_SYSCALLS),1)
   #Use UHI to handle syscalls
   export LINKFLAGS += -luhi
   export USEMODULE += newlib_syscalls_mips_uhi
+  EXTRA_LIBS += $(BINDIR)/newlib_syscalls_mips_uhi.a
 else
   #Use RIOT to handle syscalls (default)
   export USEMODULE += newlib_syscalls_default

diff --git a/cpu/mips32r2_generic/include/periph_cpu.h b/cpu/mips32r2_generic/include/periph_cpu.h
@@ -24,6 +24,13 @@ extern "C" {
 #define PROVIDES_PM_SET_LOWEST
 /** @} */
 
+/**
+ * @name    timer configuration
+ * @{
+ */
+#define PERIPH_TIMER_PROVIDES_SET
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif

@@ -4,7 +4,6 @@ INCLUDES += -I$(RIOTCPU)/msp430_common/include/
 MODEL = $(shell echo $(CPU_MODEL) | tr 'a-z' 'A-Z')
 export CFLAGS += -DCPU_MODEL_$(MODEL)
 
-export UNDEF += $(BINDIR)/msp430_common/startup.o
 export USEMODULE += msp430_common msp430_common_periph periph_common
 
 DEFAULT_MODULE += oneway_malloc

diff --git a/makefiles/arch/cortexm.inc.mk b/makefiles/arch/cortexm.inc.mk
@@ -83,13 +83,6 @@ export CFLAGS += -DARM_MATH_CM7
 endif
 endif
 
-# Explicitly tell the linker to link the startup code.
-#   Without this the interrupt vectors will not be linked correctly!
-VECTORS_O ?= $(BINDIR)/cpu/vectors.o
-ifeq ($(COMMON_STARTUP),)
-export UNDEF += $(VECTORS_O)
-endif
-
 # CPU depends on the cortex-m common module, so include it:
 include $(RIOTCPU)/cortexm_common/Makefile.include
 

diff --git a/makefiles/bindist.inc.mk b/makefiles/bindist.inc.mk
@@ -1,4 +1,4 @@
-USEMODULE += $(BIN_USEMODULE)
+USEMODULE += $(filter-out $(APPLICATION),$(BIN_USEMODULE))
 
 DIST_FILES += $(BIN_USEMODULE:%=bin/$(BOARD)/%.a)
 

diff --git a/pkg/ccn-lite/patches/0001-ccnl-riot-remove-riot-specific-ccnl_buf_new.patch b/pkg/ccn-lite/patches/0001-ccnl-riot-remove-riot-specific-ccnl_buf_new.patch
@@ -0,0 +1,38 @@
+From 8f2cb10afd5636aeaea7e89c7acd221cecfb4ce8 Mon Sep 17 00:00:00 2001
+From: Kaspar Schleiser <kaspar@schleiser.de>
+Date: Thu, 22 Feb 2018 23:04:08 +0100
+Subject: [PATCH] ccnl-riot: remove riot specific ccnl_buf_new()
+
+---
+ src/ccnl-riot/src/ccn-lite-riot.c | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
+diff --git a/src/ccnl-riot/src/ccn-lite-riot.c b/src/ccnl-riot/src/ccn-lite-riot.c
+index 6f978d15f1..65d749ec97 100644
+--- a/src/ccnl-riot/src/ccn-lite-riot.c
++++ b/src/ccnl-riot/src/ccn-lite-riot.c
+@@ -183,21 +183,6 @@ extern int ccnl_isContent(unsigned char *buf, int len, int suite);
+  * @}
+  */
+
+-// ----------------------------------------------------------------------
+-struct ccnl_buf_s*
+-ccnl_buf_new(void *data, int len)
+-{
+-    struct ccnl_buf_s *b = ccnl_malloc(sizeof(struct ccnl_buf_s) + len);
+-
+-    if (!b)
+-        return NULL;
+-    b->next = NULL;
+-    b->datalen = len;
+-    if (data)
+-        memcpy(b->data, data, len);
+-    return b;
+-}
+-
+ /* add a netif to CCN-lite's interfaces, set the nettype, and register a receiver */
+ int
+ ccnl_open_netif(kernel_pid_t if_pid, gnrc_nettype_t netreg_type)
+-- 
+2.16.1
+
diff --git a/pkg/oonf_api/Makefile.include b/pkg/oonf_api/Makefile.include
@@ -3,3 +3,5 @@ INCLUDES += -I$(PKGDIRBASE)/oonf_api/src-api
 ifeq ($(TOOLCHAIN), llvm)
   CFLAGS += -Wno-keyword-macro -Wno-parentheses-equality
 endif
+
+EXTRA_LIBS += $(BINDIR)/oonf_api.a
@@ -9,3 +9,7 @@ ifneq (,$(filter openthread_contrib,$(USEMODULE)))
   DIRS += $(OPENTHREAD_DIR)/contrib
   DIRS += $(OPENTHREAD_DIR)/contrib/netdev
 endif
+
+EXTRA_LIBS += ${BINDIR}/libmbedcrypto.a
+EXTRA_LIBS += ${BINDIR}/libopenthread.a
+EXTRA_LIBS += ${BINDIR}/libopenthread-cli.a
diff --git a/sys/Makefile.include b/sys/Makefile.include
@@ -38,9 +38,10 @@ endif
 
 ifneq (,$(filter cpp11-compat,$(USEMODULE)))
   USEMODULE_INCLUDES += $(RIOTBASE)/sys/cpp11-compat/include
-  # make sure cppsupport.o is linked explicitly because __dso_handle is not
-  # found if it is hidden away inside a static object.
-  export UNDEF += $(BINDIR)/cpp11-compat/cppsupport.o
+endif
+
+ifneq (,$(filter gnrc_slip,$(USEMODULE)))
+    FEATURES_REQUIRED += periph_uart
 endif
 
 ifneq (,$(filter embunit,$(USEMODULE)))
@@ -65,10 +66,6 @@ ifneq (,$(filter newlib,$(USEMODULE)))
   include $(RIOTMAKE)/libc/newlib.mk
 endif
 
-ifneq (,$(filter newlib_syscalls_default,$(USEMODULE)))
-  include $(RIOTBASE)/sys/newlib_syscalls_default/Makefile.include
-endif
-
 ifneq (,$(filter arduino,$(USEMODULE)))
   include $(RIOTBASE)/sys/arduino/Makefile.include
 endif

diff --git a/sys/newlib_syscalls_default/Makefile.include b/sys/newlib_syscalls_default/Makefile.include
@@ -1,4 +1,3 @@
-export APPLICATION = can_trx
 include ../Makefile.tests_common
 
 USEMODULE += shell
Original file line number	Diff line number	Diff line change
Expand Up		@@ -31,6 +31,4 @@ INCLUDES += -I$(RIOTBOARD)/common/msba2/drivers/include

		export OFLAGS = -O ihex

		export UNDEF += $(BINDIR)/cpu/startup.o

		USEMODULE += boards_common_msba2-drivers
Original file line number	Diff line number	Diff line change
Expand Up		@@ -185,5 +185,3 @@ eval-gprof:

		eval-cachegrind:
		$(CGANNOTATE) $(shell ls -rt cachegrind.out* \| tail -1)

		export UNDEF += $(BINDIR)/cpu/startup.o