Merge pull request #2031 from haukepetersen/fix_sam3x_cpp

ACK then ;) and go!
RIOT-OS · Nov 18, 2014 · b5435fa · b5435fa
2 parents fff5748 + fdbf672
commit b5435fa
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 1 deletion.
diff --git a/boards/arduino-due/Makefile.features b/boards/arduino-due/Makefile.features
@@ -1 +1,2 @@
+FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += periph_uart periph_gpio periph_spi periph_random
diff --git a/boards/arduino-due/Makefile.include b/boards/arduino-due/Makefile.include
@@ -4,6 +4,7 @@ export CPU = sam3x8e
 # define tools used for building the project
 export PREFIX = arm-none-eabi-
 export CC = $(PREFIX)gcc
+export CXX = $(PREFIX)g++
 export AR = $(PREFIX)ar
 export AS = $(PREFIX)as
 export LINK = $(PREFIX)gcc

diff --git a/boards/udoo/Makefile.features b/boards/udoo/Makefile.features
@@ -1 +1,2 @@
+FEATURES_PROVIDED += cpp
 FEATURES_PROVIDED += periph_uart periph_gpio periph_spi periph_random
diff --git a/boards/udoo/Makefile.include b/boards/udoo/Makefile.include
@@ -4,6 +4,7 @@ export CPU = sam3x8e
 # define tools used for building the project
 export PREFIX = arm-none-eabi-
 export CC = $(PREFIX)gcc
+export CXX = $(PREFIX)g++
 export AR = $(PREFIX)ar
 export AS = $(PREFIX)as
 export LINK = $(PREFIX)gcc
@@ -38,6 +39,10 @@ export OFLAGS += -O binary
 export FFLAGS += -R -e -w -v -b bin/$(BOARD)/$(APPLICATION).hex
 export TERMFLAGS += -p "$(PORT)"
 
+# unwanted (CXXUWFLAGS) and extra (CXXEXFLAGS) flags for c++
+export CXXUWFLAGS +=
+export CXXEXFLAGS +=
+
 # use the nano-specs of the NewLib when available
 ifeq ($(shell $(LINK) -specs=nano.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
 export LINKFLAGS += -specs=nano.specs -lc -lnosys

diff --git a/cpu/sam3x8e/syscalls.c b/cpu/sam3x8e/syscalls.c
@@ -156,7 +156,8 @@ pid_t _getpid(void)
  *
  * @return      TODO
  */
-int _kill_r(struct _reent *r, pid_t pid, int sig)
+__attribute__ ((weak))
+int _kill_r(struct _reent *r, int pid, int sig)
 {
     r->_errno = ESRCH;                      /* not implemented yet */
     return -1;
@@ -323,3 +324,18 @@ int _unlink_r(struct _reent *r, char* path)
     r->_errno = ENODEV;                     /* not implemented yet */
     return -1;
 }
+
+/**
+ * @brief Send a signal to a thread
+ *
+ * @param[in] pid the pid to send to
+ * @param[in] sig the signal to send
+ *
+ * @return TODO
+ */
+__attribute__ ((weak))
+int _kill(int pid, int sig)
+{
+    errno = ESRCH;                         /* not implemented yet */
+    return -1;
+}