diff --git a/misc/uClibc++/README.txt b/misc/uClibc++/README.txt
index d11efa6506..83b4c13f9c 100755
--- a/misc/uClibc++/README.txt
+++ b/misc/uClibc++/README.txt
@@ -28,7 +28,22 @@ using this command executed from the misc/uClibc++ directory:
If you run the install.sh like this, then it will (1) make sure you
understand that you have tainted the NuttX BSD license with LGPLv3, and (2)
copy the uClibc++ sources files into nuttx/libxx/uClibc++, include/, and
-include/cxx.
+include/uClibc++.
+
+Make.defs File Changes
+^^^^^^^^^^^^^^^^^^^^^^
+
+The new files that appear in nuttx/include/uClibc++ must be include-able
+as system header files. So you will need to add 'isystem $(TOPDIR)/include/uClibc++'
+to the ARCHINCLUDESXX definition in the NuttX Make.defs file, perhap like:
+
+ -ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+ +ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/uClibc++
+
+And, of course, you no long need to suppress exceptions or run-time typing:
+
+ -ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
+ +ARCHCPUFLAGSXX = -fno-builtin
Building NuttX with uClibc++
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/misc/uClibc++/include/cxx/Makefile b/misc/uClibc++/include/uClibc++/Makefile
similarity index 100%
rename from misc/uClibc++/include/cxx/Makefile
rename to misc/uClibc++/include/uClibc++/Makefile
diff --git a/misc/uClibc++/include/cxx/algorithm b/misc/uClibc++/include/uClibc++/algorithm
similarity index 100%
rename from misc/uClibc++/include/cxx/algorithm
rename to misc/uClibc++/include/uClibc++/algorithm
diff --git a/misc/uClibc++/include/cxx/associative_base b/misc/uClibc++/include/uClibc++/associative_base
similarity index 100%
rename from misc/uClibc++/include/cxx/associative_base
rename to misc/uClibc++/include/uClibc++/associative_base
diff --git a/misc/uClibc++/include/cxx/basic_definitions b/misc/uClibc++/include/uClibc++/basic_definitions
similarity index 100%
rename from misc/uClibc++/include/cxx/basic_definitions
rename to misc/uClibc++/include/uClibc++/basic_definitions
diff --git a/misc/uClibc++/include/cxx/bitset b/misc/uClibc++/include/uClibc++/bitset
similarity index 100%
rename from misc/uClibc++/include/cxx/bitset
rename to misc/uClibc++/include/uClibc++/bitset
diff --git a/misc/uClibc++/include/cxx/cfloat b/misc/uClibc++/include/uClibc++/cfloat
similarity index 100%
rename from misc/uClibc++/include/cxx/cfloat
rename to misc/uClibc++/include/uClibc++/cfloat
diff --git a/misc/uClibc++/include/cxx/char_traits b/misc/uClibc++/include/uClibc++/char_traits
similarity index 100%
rename from misc/uClibc++/include/cxx/char_traits
rename to misc/uClibc++/include/uClibc++/char_traits
diff --git a/misc/uClibc++/include/cxx/clocale b/misc/uClibc++/include/uClibc++/clocale
similarity index 100%
rename from misc/uClibc++/include/cxx/clocale
rename to misc/uClibc++/include/uClibc++/clocale
diff --git a/misc/uClibc++/include/cxx/complex b/misc/uClibc++/include/uClibc++/complex
similarity index 100%
rename from misc/uClibc++/include/cxx/complex
rename to misc/uClibc++/include/uClibc++/complex
diff --git a/misc/uClibc++/include/cxx/csetjmp b/misc/uClibc++/include/uClibc++/csetjmp
similarity index 100%
rename from misc/uClibc++/include/cxx/csetjmp
rename to misc/uClibc++/include/uClibc++/csetjmp
diff --git a/misc/uClibc++/include/cxx/cwchar b/misc/uClibc++/include/uClibc++/cwchar
similarity index 100%
rename from misc/uClibc++/include/cxx/cwchar
rename to misc/uClibc++/include/uClibc++/cwchar
diff --git a/misc/uClibc++/include/cxx/cwctype b/misc/uClibc++/include/uClibc++/cwctype
similarity index 100%
rename from misc/uClibc++/include/cxx/cwctype
rename to misc/uClibc++/include/uClibc++/cwctype
diff --git a/misc/uClibc++/include/cxx/deque b/misc/uClibc++/include/uClibc++/deque
similarity index 100%
rename from misc/uClibc++/include/cxx/deque
rename to misc/uClibc++/include/uClibc++/deque
diff --git a/misc/uClibc++/include/cxx/exception b/misc/uClibc++/include/uClibc++/exception
similarity index 100%
rename from misc/uClibc++/include/cxx/exception
rename to misc/uClibc++/include/uClibc++/exception
diff --git a/misc/uClibc++/include/cxx/fstream b/misc/uClibc++/include/uClibc++/fstream
similarity index 100%
rename from misc/uClibc++/include/cxx/fstream
rename to misc/uClibc++/include/uClibc++/fstream
diff --git a/misc/uClibc++/include/cxx/func_exception b/misc/uClibc++/include/uClibc++/func_exception
similarity index 100%
rename from misc/uClibc++/include/cxx/func_exception
rename to misc/uClibc++/include/uClibc++/func_exception
diff --git a/misc/uClibc++/include/cxx/functional b/misc/uClibc++/include/uClibc++/functional
similarity index 100%
rename from misc/uClibc++/include/cxx/functional
rename to misc/uClibc++/include/uClibc++/functional
diff --git a/misc/uClibc++/include/cxx/iomanip b/misc/uClibc++/include/uClibc++/iomanip
similarity index 100%
rename from misc/uClibc++/include/cxx/iomanip
rename to misc/uClibc++/include/uClibc++/iomanip
diff --git a/misc/uClibc++/include/cxx/ios b/misc/uClibc++/include/uClibc++/ios
similarity index 100%
rename from misc/uClibc++/include/cxx/ios
rename to misc/uClibc++/include/uClibc++/ios
diff --git a/misc/uClibc++/include/cxx/iosfwd b/misc/uClibc++/include/uClibc++/iosfwd
similarity index 100%
rename from misc/uClibc++/include/cxx/iosfwd
rename to misc/uClibc++/include/uClibc++/iosfwd
diff --git a/misc/uClibc++/include/cxx/iostream b/misc/uClibc++/include/uClibc++/iostream
similarity index 100%
rename from misc/uClibc++/include/cxx/iostream
rename to misc/uClibc++/include/uClibc++/iostream
diff --git a/misc/uClibc++/include/cxx/istream b/misc/uClibc++/include/uClibc++/istream
similarity index 100%
rename from misc/uClibc++/include/cxx/istream
rename to misc/uClibc++/include/uClibc++/istream
diff --git a/misc/uClibc++/include/cxx/istream_helpers b/misc/uClibc++/include/uClibc++/istream_helpers
similarity index 100%
rename from misc/uClibc++/include/cxx/istream_helpers
rename to misc/uClibc++/include/uClibc++/istream_helpers
diff --git a/misc/uClibc++/include/cxx/iterator b/misc/uClibc++/include/uClibc++/iterator
similarity index 100%
rename from misc/uClibc++/include/cxx/iterator
rename to misc/uClibc++/include/uClibc++/iterator
diff --git a/misc/uClibc++/include/cxx/iterator_base b/misc/uClibc++/include/uClibc++/iterator_base
similarity index 100%
rename from misc/uClibc++/include/cxx/iterator_base
rename to misc/uClibc++/include/uClibc++/iterator_base
diff --git a/misc/uClibc++/include/cxx/limits b/misc/uClibc++/include/uClibc++/limits
similarity index 100%
rename from misc/uClibc++/include/cxx/limits
rename to misc/uClibc++/include/uClibc++/limits
diff --git a/misc/uClibc++/include/cxx/list b/misc/uClibc++/include/uClibc++/list
similarity index 100%
rename from misc/uClibc++/include/cxx/list
rename to misc/uClibc++/include/uClibc++/list
diff --git a/misc/uClibc++/include/cxx/locale b/misc/uClibc++/include/uClibc++/locale
similarity index 100%
rename from misc/uClibc++/include/cxx/locale
rename to misc/uClibc++/include/uClibc++/locale
diff --git a/misc/uClibc++/include/cxx/map b/misc/uClibc++/include/uClibc++/map
similarity index 100%
rename from misc/uClibc++/include/cxx/map
rename to misc/uClibc++/include/uClibc++/map
diff --git a/misc/uClibc++/include/cxx/memory b/misc/uClibc++/include/uClibc++/memory
similarity index 100%
rename from misc/uClibc++/include/cxx/memory
rename to misc/uClibc++/include/uClibc++/memory
diff --git a/misc/uClibc++/include/cxx/new b/misc/uClibc++/include/uClibc++/new
similarity index 100%
rename from misc/uClibc++/include/cxx/new
rename to misc/uClibc++/include/uClibc++/new
diff --git a/misc/uClibc++/include/cxx/numeric b/misc/uClibc++/include/uClibc++/numeric
similarity index 100%
rename from misc/uClibc++/include/cxx/numeric
rename to misc/uClibc++/include/uClibc++/numeric
diff --git a/misc/uClibc++/include/cxx/ostream b/misc/uClibc++/include/uClibc++/ostream
similarity index 100%
rename from misc/uClibc++/include/cxx/ostream
rename to misc/uClibc++/include/uClibc++/ostream
diff --git a/misc/uClibc++/include/cxx/ostream_helpers b/misc/uClibc++/include/uClibc++/ostream_helpers
similarity index 100%
rename from misc/uClibc++/include/cxx/ostream_helpers
rename to misc/uClibc++/include/uClibc++/ostream_helpers
diff --git a/misc/uClibc++/include/cxx/queue b/misc/uClibc++/include/uClibc++/queue
similarity index 100%
rename from misc/uClibc++/include/cxx/queue
rename to misc/uClibc++/include/uClibc++/queue
diff --git a/misc/uClibc++/include/cxx/set b/misc/uClibc++/include/uClibc++/set
similarity index 100%
rename from misc/uClibc++/include/cxx/set
rename to misc/uClibc++/include/uClibc++/set
diff --git a/misc/uClibc++/include/cxx/sstream b/misc/uClibc++/include/uClibc++/sstream
similarity index 100%
rename from misc/uClibc++/include/cxx/sstream
rename to misc/uClibc++/include/uClibc++/sstream
diff --git a/misc/uClibc++/include/cxx/stack b/misc/uClibc++/include/uClibc++/stack
similarity index 100%
rename from misc/uClibc++/include/cxx/stack
rename to misc/uClibc++/include/uClibc++/stack
diff --git a/misc/uClibc++/include/cxx/stdexcept b/misc/uClibc++/include/uClibc++/stdexcept
similarity index 100%
rename from misc/uClibc++/include/cxx/stdexcept
rename to misc/uClibc++/include/uClibc++/stdexcept
diff --git a/misc/uClibc++/include/cxx/streambuf b/misc/uClibc++/include/uClibc++/streambuf
similarity index 100%
rename from misc/uClibc++/include/cxx/streambuf
rename to misc/uClibc++/include/uClibc++/streambuf
diff --git a/misc/uClibc++/include/cxx/string b/misc/uClibc++/include/uClibc++/string
similarity index 100%
rename from misc/uClibc++/include/cxx/string
rename to misc/uClibc++/include/uClibc++/string
diff --git a/misc/uClibc++/include/cxx/string_iostream b/misc/uClibc++/include/uClibc++/string_iostream
similarity index 100%
rename from misc/uClibc++/include/cxx/string_iostream
rename to misc/uClibc++/include/uClibc++/string_iostream
diff --git a/misc/uClibc++/include/cxx/support b/misc/uClibc++/include/uClibc++/support
similarity index 100%
rename from misc/uClibc++/include/cxx/support
rename to misc/uClibc++/include/uClibc++/support
diff --git a/misc/uClibc++/include/cxx/system_configuration.h b/misc/uClibc++/include/uClibc++/system_configuration.h
similarity index 100%
rename from misc/uClibc++/include/cxx/system_configuration.h
rename to misc/uClibc++/include/uClibc++/system_configuration.h
diff --git a/misc/uClibc++/include/cxx/type_traits b/misc/uClibc++/include/uClibc++/type_traits
similarity index 100%
rename from misc/uClibc++/include/cxx/type_traits
rename to misc/uClibc++/include/uClibc++/type_traits
diff --git a/misc/uClibc++/include/cxx/typeinfo b/misc/uClibc++/include/uClibc++/typeinfo
similarity index 100%
rename from misc/uClibc++/include/cxx/typeinfo
rename to misc/uClibc++/include/uClibc++/typeinfo
diff --git a/misc/uClibc++/include/cxx/unwind-cxx.h b/misc/uClibc++/include/uClibc++/unwind-cxx.h
similarity index 100%
rename from misc/uClibc++/include/cxx/unwind-cxx.h
rename to misc/uClibc++/include/uClibc++/unwind-cxx.h
diff --git a/misc/uClibc++/include/cxx/utility b/misc/uClibc++/include/uClibc++/utility
similarity index 100%
rename from misc/uClibc++/include/cxx/utility
rename to misc/uClibc++/include/uClibc++/utility
diff --git a/misc/uClibc++/include/cxx/valarray b/misc/uClibc++/include/uClibc++/valarray
similarity index 100%
rename from misc/uClibc++/include/cxx/valarray
rename to misc/uClibc++/include/uClibc++/valarray
diff --git a/misc/uClibc++/include/cxx/vector b/misc/uClibc++/include/uClibc++/vector
similarity index 100%
rename from misc/uClibc++/include/cxx/vector
rename to misc/uClibc++/include/uClibc++/vector
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 0c98d4ad2e..be23be91d2 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -556,6 +556,14 @@
+
+
|
+
+
+ Add-on uClibc++ C++ Library is available (LGPL).
+
+ |
+
 |
diff --git a/nuttx/configs/sim/cxxtest/Make.defs b/nuttx/configs/sim/cxxtest/Make.defs
index 6e8de79d57..eac92e9282 100644
--- a/nuttx/configs/sim/cxxtest/Make.defs
+++ b/nuttx/configs/sim/cxxtest/Make.defs
@@ -51,7 +51,7 @@ ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
ARCHWARNINGSXX = -Wall -Wshadow
ARCHDEFINES =
ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx -isystem $(TOPDIR)/include/uClibc++
ARCHSCRIPT =
ifeq ($(CONFIG_SIM_M32),y)
@@ -101,7 +101,6 @@ ifeq ($(CONFIG_SIM_M32),y)
LDFLAGS += -m32
endif
-
MKDEP = $(TOPDIR)/tools/mkdeps.sh
HOSTCC = gcc