From e60d4488b3f03a07d55bd164615ec8acf732aa0e Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Thu, 1 Nov 2012 12:19:20 +0000
Subject: [PATCH] Put uClibc++ header files in a different directory from NuttX
 header files

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5287 42af7a65-404d-4744-a932-0658087f49c3
---
 misc/uClibc++/README.txt                        | 17 ++++++++++++++++-
 .../uClibc++/include/{cxx => uClibc++}/Makefile |  0
 .../include/{cxx => uClibc++}/algorithm         |  0
 .../include/{cxx => uClibc++}/associative_base  |  0
 .../include/{cxx => uClibc++}/basic_definitions |  0
 misc/uClibc++/include/{cxx => uClibc++}/bitset  |  0
 misc/uClibc++/include/{cxx => uClibc++}/cfloat  |  0
 .../include/{cxx => uClibc++}/char_traits       |  0
 misc/uClibc++/include/{cxx => uClibc++}/clocale |  0
 misc/uClibc++/include/{cxx => uClibc++}/complex |  0
 misc/uClibc++/include/{cxx => uClibc++}/csetjmp |  0
 misc/uClibc++/include/{cxx => uClibc++}/cwchar  |  0
 misc/uClibc++/include/{cxx => uClibc++}/cwctype |  0
 misc/uClibc++/include/{cxx => uClibc++}/deque   |  0
 .../include/{cxx => uClibc++}/exception         |  0
 misc/uClibc++/include/{cxx => uClibc++}/fstream |  0
 .../include/{cxx => uClibc++}/func_exception    |  0
 .../include/{cxx => uClibc++}/functional        |  0
 misc/uClibc++/include/{cxx => uClibc++}/iomanip |  0
 misc/uClibc++/include/{cxx => uClibc++}/ios     |  0
 misc/uClibc++/include/{cxx => uClibc++}/iosfwd  |  0
 .../uClibc++/include/{cxx => uClibc++}/iostream |  0
 misc/uClibc++/include/{cxx => uClibc++}/istream |  0
 .../include/{cxx => uClibc++}/istream_helpers   |  0
 .../uClibc++/include/{cxx => uClibc++}/iterator |  0
 .../include/{cxx => uClibc++}/iterator_base     |  0
 misc/uClibc++/include/{cxx => uClibc++}/limits  |  0
 misc/uClibc++/include/{cxx => uClibc++}/list    |  0
 misc/uClibc++/include/{cxx => uClibc++}/locale  |  0
 misc/uClibc++/include/{cxx => uClibc++}/map     |  0
 misc/uClibc++/include/{cxx => uClibc++}/memory  |  0
 misc/uClibc++/include/{cxx => uClibc++}/new     |  0
 misc/uClibc++/include/{cxx => uClibc++}/numeric |  0
 misc/uClibc++/include/{cxx => uClibc++}/ostream |  0
 .../include/{cxx => uClibc++}/ostream_helpers   |  0
 misc/uClibc++/include/{cxx => uClibc++}/queue   |  0
 misc/uClibc++/include/{cxx => uClibc++}/set     |  0
 misc/uClibc++/include/{cxx => uClibc++}/sstream |  0
 misc/uClibc++/include/{cxx => uClibc++}/stack   |  0
 .../include/{cxx => uClibc++}/stdexcept         |  0
 .../include/{cxx => uClibc++}/streambuf         |  0
 misc/uClibc++/include/{cxx => uClibc++}/string  |  0
 .../include/{cxx => uClibc++}/string_iostream   |  0
 misc/uClibc++/include/{cxx => uClibc++}/support |  0
 .../{cxx => uClibc++}/system_configuration.h    |  0
 .../include/{cxx => uClibc++}/type_traits       |  0
 .../uClibc++/include/{cxx => uClibc++}/typeinfo |  0
 .../include/{cxx => uClibc++}/unwind-cxx.h      |  0
 misc/uClibc++/include/{cxx => uClibc++}/utility |  0
 .../uClibc++/include/{cxx => uClibc++}/valarray |  0
 misc/uClibc++/include/{cxx => uClibc++}/vector  |  0
 nuttx/Documentation/NuttX.html                  |  8 ++++++++
 nuttx/configs/sim/cxxtest/Make.defs             |  3 +--
 53 files changed, 25 insertions(+), 3 deletions(-)
 rename misc/uClibc++/include/{cxx => uClibc++}/Makefile (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/algorithm (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/associative_base (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/basic_definitions (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/bitset (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/cfloat (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/char_traits (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/clocale (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/complex (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/csetjmp (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/cwchar (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/cwctype (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/deque (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/exception (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/fstream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/func_exception (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/functional (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/iomanip (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/ios (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/iosfwd (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/iostream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/istream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/istream_helpers (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/iterator (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/iterator_base (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/limits (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/list (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/locale (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/map (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/memory (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/new (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/numeric (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/ostream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/ostream_helpers (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/queue (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/set (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/sstream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/stack (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/stdexcept (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/streambuf (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/string (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/string_iostream (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/support (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/system_configuration.h (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/type_traits (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/typeinfo (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/unwind-cxx.h (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/utility (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/valarray (100%)
 rename misc/uClibc++/include/{cxx => uClibc++}/vector (100%)

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 @@
     </p>
   </td>
 </tr>
+<tr>
+  <td><br></td>
+  <td>
+    <p>
+      <li>Add-on <a href="http://cxx.uclibc.org/">uClibc++</a> C++ Library is available (LGPL).</li>
+    </p>
+  </td>
+</tr>
 
 <tr>
   <td valign="top" width="22"><img height="20" width="20" src="favicon.ico"></td>
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