Rebased onto master, and added and updated pathces so Eigen will compile

5 files changed, 40 insertions, 19 deletions

diff --git a/nuttx-configs/aerocore/nsh/defconfig b/nuttx-configs/aerocore/nsh/defconfig
index d284db7fd..884ec40f7 100644
--- a/nuttx-configs/aerocore/nsh/defconfig
+++ b/nuttx-configs/aerocore/nsh/defconfig
@@ -667,6 +667,9 @@ CONFIG_LIBC_STRERROR=y
 # CONFIG_LIBC_STRERROR_SHORT is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
 CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIBC_LOCALTIME=y
+CONFIG_LIBC_TZ_MAX_TIMES=1
+CONFIG_LIBC_TZ_MAX_TYPES=1
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y
diff --git a/nuttx-configs/px4fmu-v1/nsh/defconfig b/nuttx-configs/px4fmu-v1/nsh/defconfig
index 2f85e9e50..4157012e1 100644
--- a/nuttx-configs/px4fmu-v1/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v1/nsh/defconfig
@@ -934,7 +934,9 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_TMPDIR="/tmp"
 CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
-# CONFIG_LIBC_LOCALTIME is not set
+CONFIG_LIBC_LOCALTIME=y
+CONFIG_LIBC_TZ_MAX_TIMES=1
+CONFIG_LIBC_TZ_MAX_TYPES=1
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y
diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig
index 2688bbbdb..558c0ca65 100644
--- a/nuttx-configs/px4fmu-v2/nsh/defconfig
+++ b/nuttx-configs/px4fmu-v2/nsh/defconfig
@@ -1030,7 +1030,9 @@ CONFIG_LIBC_STRERROR=y
 CONFIG_LIBC_TMPDIR="/tmp"
 CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
-# CONFIG_LIBC_LOCALTIME is not set
+CONFIG_LIBC_LOCALTIME=y
+CONFIG_LIBC_TZ_MAX_TIMES=1
+CONFIG_LIBC_TZ_MAX_TYPES=1
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 CONFIG_ARCH_OPTIMIZED_FUNCTIONS=y
diff --git a/nuttx-patches/c++11.patch b/nuttx-patches/c++11.patch
index 70276aa92..00794db18 100644
--- a/nuttx-patches/c++11.patch
+++ b/nuttx-patches/c++11.patch
@@ -1,8 +1,8 @@
 diff --git NuttX/nuttx/include/cxx/cwchar NuttX/nuttx/include/cxx/cwchar
-index 67716ab..bd21740 100755
+index 67716ab..a6c6cfe 100755
 --- NuttX/nuttx/include/cxx/cwchar
 +++ NuttX/nuttx/include/cxx/cwchar
-@@ -46,13 +46,115 @@
+@@ -46,13 +46,100 @@
  // Namespace
  //***************************************************************************
  
@@ -40,18 +40,6 @@ index 67716ab..bd21740 100755
 +wint_t            btowc(int);
 +int               fwprintf(FILE *, const wchar_t *, ...);
 +int               fwscanf(FILE *, const wchar_t *, ...);
-+int               iswalnum(wint_t);
-+int               iswalpha(wint_t);
-+int               iswcntrl(wint_t);
-+int               iswdigit(wint_t);
-+int               iswgraph(wint_t);
-+int               iswlower(wint_t);
-+int               iswprint(wint_t);
-+int               iswpunct(wint_t);
-+int               iswspace(wint_t);
-+int               iswupper(wint_t);
-+int               iswxdigit(wint_t);
-+int               iswctype(wint_t, wctype_t);
 +wint_t            fgetwc(FILE *);
 +wchar_t          *fgetws(wchar_t *, int, FILE *);
 +wint_t            fputwc(wchar_t, FILE *);
@@ -69,8 +57,6 @@ index 67716ab..bd21740 100755
 +wint_t            putwchar(wchar_t);
 +int               swprintf(wchar_t *, size_t, const wchar_t *, ...);
 +int               swscanf(const wchar_t *, const wchar_t *, ...);
-+wint_t            towlower(wint_t);
-+wint_t            towupper(wint_t);
 +wint_t            ungetwc(wint_t, FILE *);
 +int               vfwprintf(FILE *, const wchar_t *, va_list);
 +int               vwprintf(const wchar_t *, va_list);
@@ -103,7 +89,6 @@ index 67716ab..bd21740 100755
 +int               wcswidth(const wchar_t *, size_t);
 +size_t            wcsxfrm(wchar_t *, const wchar_t *, size_t);
 +int               wctob(wint_t);
-+wctype_t          wctype(const char *);
 +int               wcwidth(wchar_t);
 +wchar_t          *wmemchr(const wchar_t *, wchar_t, size_t);
 +int               wmemcmp(const wchar_t *, const wchar_t *, size_t);
diff --git a/nuttx-patches/eigen.patch b/nuttx-patches/eigen.patch
new file mode 100644
index 000000000..a02bd9950
--- /dev/null
+++ b/nuttx-patches/eigen.patch
@@ -0,0 +1,29 @@
+diff --git NuttX/nuttx/include/ctype.h NuttX/nuttx/include/ctype.h
+index fdcaad8..26550f8 100644
+--- NuttX/nuttx/include/ctype.h
++++ NuttX/nuttx/include/ctype.h
+@@ -49,6 +49,24 @@
+  * Pre-processor Definitions
+  ****************************************************************************/
+ 
++/* N.B. The following definitions are enabled at this time to allow the PX4
++ * development to continue until there is a SAFE  solution to foreign
++ * (non-nuttx) header file inclusion. There is a potential of a binary
++ * incompatibility and runtime errors, memory overwrites or corruption
++ * VVVVVVVVVVVVVVVVVVVVVVVVVV Begin Warning VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
++ */
++
++#define _U  01
++#define _L  02
++#define _N  04
++#define _S  010
++#define _P  020
++#define _C  040
++#define _X  0100
++#define _B  0200
++
++/*^^^^^^^^^^^^^^^^^^^^^^^^^ End Warning ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
++
+ /****************************************************************************
+  * Name: isspace
+  *