diff options
| -rwxr-xr-x | misc/uClibc++/README.txt | 2 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/include/cxx/cstdbool | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/misc/uClibc++/README.txt b/misc/uClibc++/README.txt index c038d829e..e4786d3db 100755 --- a/misc/uClibc++/README.txt +++ b/misc/uClibc++/README.txt @@ -213,6 +213,8 @@ restore it later): Then remove vterminate.o from the library. At build time, the uClibc++ package will provide a usable replacement vterminate.o. + arm-none-eabi-ar.exe -d libsupc++.a vterminate.o + Now NuttX should link with no problem. If you want to restore the vterminate.o that you removed from libsupc++, you can do that with: diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 8c75a32f4..acc0d990e 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6687,4 +6687,5 @@ * configs/*/defconfig: If CONFIG_NSH_LIBRARY=y then set CONFIG_NSH_READLINE=y otherwise the CLE will be selected by default the next time that make menuconfig is used (2014-2-28). + * include/cxx/cstdbool: Ignore _Bool8 if CONFIG_C99_BOOL8=y. (2014-2-28). diff --git a/nuttx/include/cxx/cstdbool b/nuttx/include/cxx/cstdbool index 192fde490..d21a13b35 100644 --- a/nuttx/include/cxx/cstdbool +++ b/nuttx/include/cxx/cstdbool @@ -50,9 +50,11 @@ // Namespace //*************************************************************************** +#ifndef CONFIG_C99_BOOL8 namespace std { using ::_Bool8; } +#endif #endif // __INCLUDE_CXX_CSTDBOOL |