Another dtoa() fix from Mike Smith

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5229 42af7a65-404d-4744-a932-0658087f49c3

9 files changed, 121 insertions, 94 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 7121c506f..a8e045616 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3469,4 +3469,5 @@
 	  xxx-nuttx-elf- vs. xxx-elf-
 	* configs/shenzhou/*/Make.defs:  Now uses the new buildroot 4.6.3
 	  EABI toolchain.
+	* lib/stdio/lib_libdtoa.c:  Another dtoa() fix from Mike Smith.
 
diff --git a/nuttx/configs/eagle100/README.txt b/nuttx/configs/eagle100/README.txt
index d868817cc..c9253960a 100644
--- a/nuttx/configs/eagle100/README.txt
+++ b/nuttx/configs/eagle100/README.txt
@@ -416,13 +416,24 @@ Where <subdir> is one of the following:
     interface should also be functional, but is not enabled in this
     configuration).
 
+  nxflat:
+    This builds the NXFLAT example at apps/examples/nxfalt.
+
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
   ostest:
     This configuration directory, performs a simple OS test using
     examples/ostest.
 
   thttpd:
     This builds the THTTPD web server example using the THTTPD and
-    the examples/thttpd application.
+    the apps/examples/thttpd application.
+
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
 
 By default, all of these examples are built to be used with the Luminary
 Ethernet Bootloader (you can change the ld.script file in any of these
diff --git a/nuttx/configs/eagle100/nxflat/Make.defs b/nuttx/configs/eagle100/nxflat/Make.defs
index 41e738ec8..780e85850 100644
--- a/nuttx/configs/eagle100/nxflat/Make.defs
+++ b/nuttx/configs/eagle100/nxflat/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/eagle100/nxflat/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,36 +40,36 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM toolchain
 #   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
 #   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX OABI buildroot toolchain
 
-CROSSDEV		= arm-eabi-
-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			= arm-eabi-
+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
 
-MKNXFLAT		= mknxflat
-LDNXFLAT		= ldnxflat
+MKNXFLAT			= mknxflat
+LDNXFLAT			= ldnxflat
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+ARCHCCMAJOR			= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
 ifeq ($(CROSSDEV),arm-nuttx-elf-)
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+  MKDEP				= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
   ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nxflat/ld.script
   MAXOPTIMIZATION	= -Os
 else
-  WINTOOL		= y
-  DIRLINK 		= $(TOPDIR)/tools/winlink.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  WINTOOL			= y
+  DIRLINK 			= $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK			= $(TOPDIR)/tools/unlink.sh
+  MKDEP				= $(TOPDIR)/tools/mknulldeps.sh
   ARCHCPUFLAGS		= -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -83,42 +83,42 @@ else
   ARCHOPTIMIZATION	= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ARCHCFLAGS		= -fno-builtin
+ARCHCFLAGS			= -fno-builtin
 ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX		= -Wall -Wshadow
-ARCHDEFINES		=
+ARCHDEFINES			=
 ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
 
-CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+CFLAGS				= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+					  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS			= $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS			= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+					  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS			= $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS			= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS				= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
-			  -no-check-sections
+					  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoffset.ld \
+					  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+OBJEXT				= .o
+LIBEXT				= .a
+EXEEXT				=
 
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS		+= -nostartfiles -nodefaultlibs
+  LDFLAGS			+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS			+= -g
 endif
 
 
-HOSTCC			= gcc
+HOSTCC				= gcc
 HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+HOSTCFLAGS			= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS			=
 
diff --git a/nuttx/configs/eagle100/thttpd/Make.defs b/nuttx/configs/eagle100/thttpd/Make.defs
index 92f68d9f1..87157525b 100644
--- a/nuttx/configs/eagle100/thttpd/Make.defs
+++ b/nuttx/configs/eagle100/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/eagle100/thttpd/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -40,36 +40,36 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the devkitARM toolchain
 #   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
 #   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX OABI buildroot toolchain
 
-CROSSDEV		= arm-eabi-
-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			= arm-eabi-
+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
 
-MKNXFLAT		= mknxflat
-LDNXFLAT		= ldnxflat
+MKNXFLAT			= mknxflat
+LDNXFLAT			= ldnxflat
 
 ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+ARCHCCMAJOR			= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
 
 ifeq ($(CROSSDEV),arm-nuttx-elf-)
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
+  MKDEP				= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
   ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/thttpd/ld.script
   MAXOPTIMIZATION	= -Os
 else
-  WINTOOL		= y
-  DIRLINK 		= $(TOPDIR)/tools/winlink.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  WINTOOL			= y
+  DIRLINK 			= $(TOPDIR)/tools/winlink.sh
+  DIRUNLINK			= $(TOPDIR)/tools/unlink.sh
+  MKDEP				= $(TOPDIR)/tools/mknulldeps.sh
   ARCHCPUFLAGS		= -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
   ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
@@ -83,42 +83,42 @@ else
   ARCHOPTIMIZATION	= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ARCHCFLAGS		= -fno-builtin
+ARCHCFLAGS			= -fno-builtin
 ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
 ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
 ARCHWARNINGSXX		= -Wall -Wshadow
-ARCHDEFINES		=
+ARCHDEFINES			=
 ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
 
-CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
-			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
+CFLAGS				= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+					  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS			= $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS			= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+					  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXPICFLAGS			= $(ARCHPICFLAGS) $(CXXFLAGS)
+CPPFLAGS			= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+AFLAGS				= $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1		= -r -d -warn-common
 NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
-			  -no-check-sections
+					  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
+					  -no-check-sections
 LDNXFLATFLAGS		= -e main -s 2048
 
-OBJEXT			= .o
-LIBEXT			= .a
-EXEEXT			=
+OBJEXT				= .o
+LIBEXT				= .a
+EXEEXT				=
 
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS		+= -nostartfiles -nodefaultlibs
+  LDFLAGS			+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS			+= -g
 endif
 
 
-HOSTCC			= gcc
+HOSTCC				= gcc
 HOSTINCLUDES		= -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+HOSTCFLAGS			= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTLDFLAGS			=
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/README.txt b/nuttx/configs/lpcxpresso-lpc1768/README.txt
index 8ea038514..9660e12fe 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/README.txt
+++ b/nuttx/configs/lpcxpresso-lpc1768/README.txt
@@ -800,6 +800,10 @@ Where <subdir> is one of the following:
     NOTE:  You will need to build the NXFLAT toolchain as described
     above in order to use this example.
 
+    See also note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
     Jumpers: Nothing special.  Use the default base board jumper
     settings.
 
diff --git a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index b6a324546..0f3212522 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/nuttx/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/lpcxpresso-lpc1768/thttpd/Make.defs
 #
-#   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -59,11 +59,11 @@ endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   # OABI
-  # CROSSDEV = arm-nuttx-elf-
-  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  CROSSDEV = arm-nuttx-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   # EABI
-  CROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  # CROSSDEV = arm-nuttx-eabi-
+  # ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 ifeq ($(CONFIG_LPC17_CODEREDW),y)
@@ -88,14 +88,14 @@ ifeq ($(WINTOOL),y)
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
   ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/thttpd/ld.script}"
   MAXOPTIMIZATION = -O2
-  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld}"
+  NXFLATLDSCRIPT = -T "${shell cygpath -w $(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld}"
 else
   # Linux/Cygwin-native toolchain 
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
   ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/thttpd/ld.script
-  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld"
+  NXFLATLDSCRIPT = -T"$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld"
 endif
 
 CC = $(CROSSDEV)gcc
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index f53ed4647..b0b54f409 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -1025,6 +1025,10 @@ Where <subdir> is one of the following:
     This builds the THTTPD web server example using the THTTPD and
     the apps/examples/thttpd application.
 
+    NOTE: See note above with regard to the EABI/OABI buildroot
+    toolchains.  This example can only be built using the older
+    OABI toolchain.
+
   usbserial:
     This configuration directory exercises the USB serial class
     driver at apps/examples/usbserial.  See apps/examples/README.txt for
diff --git a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
index 11e155ed8..39e5ed299 100644
--- a/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/nuttx/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/olimex-lpc1766stk/thttpd/Make.defs
 #
-#   Copyright (C) 2010 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -59,11 +59,11 @@ endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
   # OABI
-  # CROSSDEV = arm-nuttx-elf-
-  # ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
+  CROSSDEV = arm-nuttx-elf-
+  ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   # EABI
-  CROSSDEV = arm-nuttx-eabi-
-  ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  # CROSSDEV = arm-nuttx-eabi-
+  # ARCHCPUFLAGS = -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
 
@@ -120,7 +120,7 @@ CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 AFLAGS = $(CFLAGS) -D__ASSEMBLY__
 
 NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections
 LDNXFLATFLAGS = -e main -s 2048
 
 OBJEXT = .o
diff --git a/nuttx/lib/stdio/lib_libdtoa.c b/nuttx/lib/stdio/lib_libdtoa.c
index 1e022a8eb..667c49c53 100644
--- a/nuttx/lib/stdio/lib_libdtoa.c
+++ b/nuttx/lib/stdio/lib_libdtoa.c
@@ -224,8 +224,15 @@ static void lib_dtoa(FAR struct lib_outstream_s *obj, int fmt, int prec,
 
           for (i = expt; i > 0; i--)
             {
-              obj->put(obj, *digits);
-              digits++;
+              if (*digits != '\0')
+                { 
+                  obj->put(obj, *digits);
+                  digits++;
+                }
+              else
+                {
+                  obj->put(obj, '0');
+                }
             }
 
           /* Get the length of the fractional part */