4 files changed, 57 insertions, 55 deletions
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index 654ce9314..39ace5495 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -215,18 +215,18 @@ cxxtest
      b. Execute 'make menuconfig' in nuttx/ in order to start the
         reconfiguration process.
 
-  3. At presenet (2012/11/02), this example builds only with exceptions
+  3. At present (2012/11/02), this example builds only with exceptions
      disabled (CONFIG_UCLIBCXX_EXCEPTIONS=n).  And even then, it will
      not run.
 
-     The reason that the example will will not run on the simulator has
+     The reason that the example will not run on the simulator has
      to do with when static constructors are enabled:  In the simulator
-     it will attempt to execute the static constructros before main()
+     it will attempt to execute the static constructors before main()
      starts. BUT... NuttX is not initialized and this results in a crash.
 
      To really use this example, I will have to think of some way to
      postpone running C++ static initializers until NuttX has been
-     initialied.
+     initialized.
 
 mount
 
diff --git a/nuttx/configs/sim/cxxtest/Make.defs b/nuttx/configs/sim/cxxtest/Make.defs
index 7b0c524b4..6f945cc51 100644
--- a/nuttx/configs/sim/cxxtest/Make.defs
+++ b/nuttx/configs/sim/cxxtest/Make.defs
@@ -93,6 +93,10 @@ LDLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(LD)
 CCLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(CC)
 LDFLAGS = $(ARCHSCRIPT) # For backward compatibility, same as CCLINKFLAGS
 
+LIBSUPXX = ${shell $(CC) --print-file-name=libsupc++.a}
+EXTRA_LIBPATHS = -L "${shell dirname "$(LIBSUPXX)"}"
+EXTRA_LIBS = -lsupc++
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
   LDLINKFLAGS += -g
   CCLINKFLAGS += -g
@@ -105,8 +109,6 @@ ifeq ($(CONFIG_SIM_M32),y)
   LDFLAGS += -m32
 endif
 
-EXTRA_LIBS = -lsupc++
-
 MKDEP = $(TOPDIR)/tools/mkdeps.sh
 
 HOSTCC = gcc
diff --git a/nuttx/configs/sim/cxxtest/defconfig b/nuttx/configs/sim/cxxtest/defconfig
index d2fef0a55..1f99a6333 100644
--- a/nuttx/configs/sim/cxxtest/defconfig
+++ b/nuttx/configs/sim/cxxtest/defconfig
@@ -288,7 +288,7 @@ CONFIG_HAVE_CXX=y
 # uClibc++ Standard C++ Library
 #
 CONFIG_UCLIBCXX=y
-CONFIG_UCLIBCXX_EXCEPTION=y
+# CONFIG_UCLIBCXX_EXCEPTION is not set
 CONFIG_UCLIBCXX_IOSTREAM_BUFSIZE=32
 CONFIG_UCLIBCXX_HAVE_LIBSUPCXX=y
 
diff --git a/nuttx/configs/sim/ostest/Make.defs b/nuttx/configs/sim/ostest/Make.defs
index 201ff7a94..975d59338 100644
--- a/nuttx/configs/sim/ostest/Make.defs
+++ b/nuttx/configs/sim/ostest/Make.defs
@@ -36,76 +36,76 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-HOSTOS			= ${shell uname -o 2>/dev/null || echo "Other"}
+HOSTOS = ${shell uname -o 2>/dev/null || echo "Other"}
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION	= -g
+  ARCHOPTIMIZATION = -g
 else
-  ARCHOPTIMIZATION	= -O2
+  ARCHOPTIMIZATION = -O2
 endif
 
-ARCHCPUFLAGS		= -fno-builtin
-ARCHCPUFLAGSXX		= -fno-builtin -fno-exceptions -fno-rtti
-ARCHPICFLAGS		= -fpic
-ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
-ARCHWARNINGSXX		= -Wall -Wshadow
-ARCHDEFINES		=
-ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-ARCHINCLUDESXX		= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-ARCHSCRIPT		=
+ARCHCPUFLAGS = -fno-builtin
+ARCHCPUFLAGSXX = -fno-builtin -fno-exceptions -fno-rtti
+ARCHPICFLAGS = -fpic
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
+ARCHWARNINGSXX = -Wall -Wshadow
+ARCHDEFINES =
+ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
+ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
+ARCHSCRIPT =
 
 ifeq ($(CONFIG_SIM_M32),y)
-  ARCHCPUFLAGS		+= -m32
-  ARCHCPUFLAGSXX	+= -m32
+  ARCHCPUFLAGS += -m32
+  ARCHCPUFLAGSXX += -m32
 endif
 
-CROSSDEV		=
-CC			= $(CROSSDEV)gcc
-CXX			= $(CROSSDEV)g++
-CPP			= $(CROSSDEV)gcc -E
-LD			= $(CROSSDEV)ld
-AR			= $(CROSSDEV)ar rcs
-NM			= $(CROSSDEV)nm
-OBJCOPY			= $(CROSSDEV)objcopy
-OBJDUMP			= $(CROSSDEV)objdump
+CROSSDEV =
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
 
-CFLAGS			= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXFLAGS		= $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXFLAGS = $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGSXX) $(ARCHINCLUDESXX) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
-OBJEXT			= .o
-LIBEXT			= .a
+OBJEXT = .o
+LIBEXT = .a
 
 ifeq ($(HOSTOS),Cygwin)
-  EXEEXT		= .exe
+  EXEEXT = .exe
 else
-  EXEEXT		=
+  EXEEXT =
 endif
 
-LDLINKFLAGS		= $(ARCHSCRIPT)	# Link flags used with $(LD)
-CCLINKFLAGS		= $(ARCHSCRIPT)	# Link flags used with $(CC)
-LDFLAGS			= $(ARCHSCRIPT)	# For backward compatibility, same as CCLINKFLAGS
+LDLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(LD)
+CCLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(CC)
+LDFLAGS = $(ARCHSCRIPT) # For backward compatibility, same as CCLINKFLAGS
 
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDLINKFLAGS		+= -g
-  CCLINKFLAGS		+= -g
-  LDFLAGS			+= -g
+  LDLINKFLAGS += -g
+  CCLINKFLAGS += -g
+  LDFLAGS += -g
 endif
 
 ifeq ($(CONFIG_SIM_M32),y)
-  LDLINKFLAGS		+= -melf_i386
-  CCLINKFLAGS		+= -m32
-  LDFLAGS			+= -m32
+  LDLINKFLAGS += -melf_i386
+  CCLINKFLAGS += -m32
+  LDFLAGS += -m32
 endif
 
 
-MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+MKDEP = $(TOPDIR)/tools/mkdeps.sh
 
-HOSTCC			= gcc
-HOSTINCLUDES		= -I.
-HOSTCFLAGS		= $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-HOSTLDFLAGS		=
+HOSTCC = gcc
+HOSTINCLUDES = -I.
+HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+   $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+HOSTLDFLAGS =