Merge pull request #672 from g-oikonomou/contrib/cortex-link

Harmonise link rule for all cortex CPUs

arch/cpu/arm/cortex-m/Makefile.cortex-m

 CONTIKI_ARM_DIRS += cortex-m cortex-m/CMSIS
 
+### Build syscalls for newlib
+MODULES += os/lib/newlib
+
+CUSTOM_RULE_LINK = 1
+
+.SECONDEXPANSION:
+
+%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT) $(TARGET_LIBS)
+	$(TRACE_LD)
+	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFLAGS) -o $@
+
 include $(CONTIKI)/arch/cpu/arm/Makefile.arm

arch/cpu/arm/cortex-m/cm3/Makefile.cm3

@@ -9,22 +9,10 @@ LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
 
 OBJCOPY_FLAGS += --gap-fill 0xff
 
-### Build syscalls for newlib
-MODULES += os/lib/newlib
-
 CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
 
-### Compilation rules
-CUSTOM_RULE_LINK = 1
-
 ### Resolve any potential circular dependencies between the linked libraries
 ### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
 TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -lm -Wl,--end-group
 
-.SECONDEXPANSION:
-
-%.elf: $(CPU_STARTFILES) $$(CONTIKI_OBJECTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(LDSCRIPT)
-	$(TRACE_LD)
-	$(Q)$(LD) $(LDFLAGS) ${filter-out $(LDSCRIPT) %.a,$^} ${filter %.a,$^} $(TARGET_LIBFLAGS) -o $@
-
 include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m

arch/cpu/arm/cortex-m/cm4/Makefile.cm4

@@ -9,20 +9,10 @@ LDFLAGS += -Wl,-Map=$(CONTIKI_NG_PROJECT_MAP),--cref,--no-warn-mismatch
 
 OBJCOPY_FLAGS += --gap-fill 0xff
 
-### Build syscalls for newlib
-MODULES += os/lib/newlib
-
 CPU_STARTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(CPU_START_SOURCEFILES)}}
 
-### Compilation rules
-CUSTOM_RULE_LINK = 1
-
 ### Resolve any potential circular dependencies between the linked libraries
 ### See: https://stackoverflow.com/questions/5651869/gcc-what-are-the-start-group-and-end-group-command-line-options/5651895
 TARGET_LIBFLAGS := -Wl,--start-group $(TARGET_LIBFILES) -Wl,--end-group
 
-%.elf: $(CPU_STARTFILES) %.o $(PROJECT_OBJECTFILES) $(PROJECT_LIBRARIES) $(CONTIKI_NG_TARGET_LIB) $(TARGET_LIBS)
-	$(TRACE_LD)
-	$(Q)$(LD) $(LDFLAGS) ${filter %.o %.a,$^} $(TARGET_LIBFLAGS) -o $@
-
 include $(CONTIKI)/arch/cpu/arm/cortex-m/Makefile.cortex-m

arch/cpu/cc26xx-cc13xx/cc26xx.ld

@@ -96,6 +96,8 @@ SECTIONS
     /* These symbols are used by the stack check library. */
     _stack = .;
     _stack_origin = ORIGIN(SRAM) + LENGTH(SRAM);
+    _heap = _stack;
+    _eheap = _stack_origin;
 
     .ccfg :
     {

arch/cpu/nrf52832/ld/nrf52-pca10036-sd.ld

@@ -14,3 +14,5 @@ INCLUDE "nrf5x_common.ld"
 /* These symbols are used by the stack check library. */
 _stack = end;
 _stack_origin = ORIGIN(RAM) + LENGTH(RAM);
+_heap = _stack;
+_eheap = _stack_origin;

arch/cpu/nrf52832/ld/nrf52-pca10040-sd.ld

@@ -14,3 +14,5 @@ INCLUDE "nrf5x_common.ld"
 /* These symbols are used by the stack check library. */
 _stack = end;
 _stack_origin = ORIGIN(RAM) + LENGTH(RAM);
+_heap = _stack;
+_eheap = _stack_origin;

arch/cpu/nrf52832/ld/nrf52.ld

@@ -14,3 +14,5 @@ INCLUDE "nrf5x_common.ld"
 /* These symbols are used by the stack check library. */
 _stack = end;
 _stack_origin = ORIGIN(RAM) + LENGTH(RAM);
+_heap = _stack;
+_eheap = _stack_origin;