From 1d1f34b3d0389fde21722371740de5dc18ed9ea3 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 5 Oct 2012 23:01:51 +0000
Subject: [PATCH] Add buildroot support for binutils-2.22 and gcc-4.6.3; all
 buildroot tools are not called abc-nuttx-elf instead of abc-elf

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5213 42af7a65-404d-4744-a932-0658087f49c3
---
 Documentation/NuttX.html                      |  34 +-
 Documentation/NuttXLinks.html                 |   1 +
 Documentation/NuttXNxFlat.html                |   4 +-
 Documentation/NuttXRelated.html               |   2 +-
 Documentation/NuttxPortingGuide.html          |  18 +-
 Documentation/UsbTrace.html                   | 664 +++++++++---------
 configs/Kconfig                               |  26 +-
 configs/README.txt                            |  24 +-
 configs/amber/hello/Make.defs                 |   2 +-
 configs/c5471evm/httpd/Make.defs              |   2 +-
 configs/c5471evm/nettest/Make.defs            |   2 +-
 configs/c5471evm/nsh/Make.defs                |   2 +-
 configs/c5471evm/ostest/Make.defs             |   2 +-
 configs/compal_e88/nsh_highram/Make.defs      |   2 +-
 configs/compal_e99/nsh_compalram/Make.defs    |   2 +-
 configs/compal_e99/nsh_highram/Make.defs      |   2 +-
 configs/demo9s12ne64/ostest/Make.defs         |   2 +-
 configs/ea3131/README.txt                     |   2 +-
 configs/ea3131/nsh/Make.defs                  |   2 +-
 configs/ea3131/ostest/Make.defs               |   2 +-
 configs/ea3131/pgnsh/Make.defs                |   2 +-
 configs/ea3131/usbserial/Make.defs            |   2 +-
 configs/ea3131/usbstorage/Make.defs           |   2 +-
 configs/ea3152/README.txt                     |   2 +-
 configs/ea3152/ostest/Make.defs               |   2 +-
 configs/eagle100/README.txt                   |   2 +-
 configs/eagle100/httpd/Make.defs              |   6 +-
 configs/eagle100/nettest/Make.defs            |   6 +-
 configs/eagle100/nsh/Make.defs                |   6 +-
 configs/eagle100/nxflat/Make.defs             |   6 +-
 configs/eagle100/ostest/Make.defs             |   6 +-
 configs/eagle100/thttpd/Make.defs             |   6 +-
 configs/ekk-lm3s9b96/nsh/Make.defs            |   4 +-
 configs/ekk-lm3s9b96/ostest/Make.defs         |   4 +-
 configs/fire-stm32v2/nsh/Make.defs            |   6 +-
 configs/hymini-stm32v/buttons/Make.defs       |   4 +-
 configs/hymini-stm32v/nsh/Make.defs           |   4 +-
 configs/hymini-stm32v/nsh2/Make.defs          |   4 +-
 configs/hymini-stm32v/nx/Make.defs            |   4 +-
 configs/hymini-stm32v/nxlines/Make.defs       |   4 +-
 configs/hymini-stm32v/usbserial/Make.defs     |   4 +-
 configs/hymini-stm32v/usbstorage/Make.defs    |   4 +-
 configs/kwikstik-k40/ostest/Make.defs         |   4 +-
 configs/lincoln60/nsh/Make.defs               |   4 +-
 configs/lincoln60/ostest/Make.defs            |   4 +-
 configs/lm3s6432-s2e/nsh/Make.defs            |   4 +-
 configs/lm3s6432-s2e/ostest/Make.defs         |   4 +-
 configs/lm3s6965-ek/nsh/Make.defs             |   4 +-
 configs/lm3s6965-ek/nx/Make.defs              |   4 +-
 configs/lm3s6965-ek/ostest/Make.defs          |   4 +-
 configs/lm3s8962-ek/nsh/Make.defs             |   4 +-
 configs/lm3s8962-ek/nx/Make.defs              |   4 +-
 configs/lm3s8962-ek/ostest/Make.defs          |   4 +-
 configs/lpc4330-xplorer/nsh/Make.defs         |   6 +-
 configs/lpc4330-xplorer/ostest/Make.defs      |   6 +-
 configs/lpcxpresso-lpc1768/dhcpd/Make.defs    |   4 +-
 configs/lpcxpresso-lpc1768/nsh/Make.defs      |   4 +-
 configs/lpcxpresso-lpc1768/nx/Make.defs       |   4 +-
 configs/lpcxpresso-lpc1768/ostest/Make.defs   |   4 +-
 configs/lpcxpresso-lpc1768/thttpd/Make.defs   |   4 +-
 .../lpcxpresso-lpc1768/usbstorage/Make.defs   |   4 +-
 configs/m68332evb/Make.defs                   |   2 +-
 configs/m68332evb/doc/m68k-defconfig          |   2 +-
 configs/mbed/hidkbd/Make.defs                 |   4 +-
 configs/mbed/nsh/Make.defs                    |   4 +-
 configs/mcu123-lpc214x/README.txt             |   2 +-
 configs/mcu123-lpc214x/composite/Make.defs    |   6 +-
 configs/mcu123-lpc214x/nsh/Make.defs          |   8 +-
 configs/mcu123-lpc214x/ostest/Make.defs       |   8 +-
 configs/mcu123-lpc214x/usbserial/Make.defs    |   8 +-
 configs/mcu123-lpc214x/usbstorage/Make.defs   |   8 +-
 configs/micropendous3/README.txt              |   2 +-
 configs/micropendous3/hello/Make.defs         |   2 +-
 configs/mx1ads/ostest/Make.defs               |   2 +-
 configs/ne64badge/ostest/Make.defs            |   2 +-
 configs/ntosd-dm320/nettest/Make.defs         |   2 +-
 configs/ntosd-dm320/nsh/Make.defs             |   2 +-
 configs/ntosd-dm320/ostest/Make.defs          |   2 +-
 configs/ntosd-dm320/poll/Make.defs            |   2 +-
 configs/ntosd-dm320/thttpd/Make.defs          |   2 +-
 configs/ntosd-dm320/udp/Make.defs             |   2 +-
 configs/ntosd-dm320/uip/Make.defs             |   2 +-
 configs/nucleus2g/nsh/Make.defs               |   4 +-
 configs/nucleus2g/ostest/Make.defs            |   4 +-
 configs/nucleus2g/usbserial/Make.defs         |   4 +-
 configs/nucleus2g/usbstorage/Make.defs        |   4 +-
 configs/olimex-lpc1766stk/README.txt          |   2 +-
 configs/olimex-lpc1766stk/ftpc/Make.defs      |   4 +-
 configs/olimex-lpc1766stk/hidkbd/Make.defs    |   4 +-
 configs/olimex-lpc1766stk/nettest/Make.defs   |   4 +-
 configs/olimex-lpc1766stk/nsh/Make.defs       |   4 +-
 configs/olimex-lpc1766stk/nx/Make.defs        |   4 +-
 configs/olimex-lpc1766stk/ostest/Make.defs    |   4 +-
 .../olimex-lpc1766stk/slip-httpd/Make.defs    |   4 +-
 configs/olimex-lpc1766stk/thttpd/Make.defs    |   4 +-
 configs/olimex-lpc1766stk/usbserial/Make.defs |   4 +-
 .../olimex-lpc1766stk/usbstorage/Make.defs    |   4 +-
 configs/olimex-lpc1766stk/wlan/Make.defs      |   4 +-
 configs/olimex-lpc2378/nsh/Make.defs          |   4 +-
 configs/olimex-lpc2378/ostest/Make.defs       |   4 +-
 configs/olimex-stm32-p107/nsh/Make.defs       |   4 +-
 configs/olimex-stm32-p107/ostest/Make.defs    |   4 +-
 configs/olimex-strp711/README.txt             |   6 +-
 configs/olimex-strp711/nettest/Make.defs      |   8 +-
 configs/olimex-strp711/nsh/Make.defs          |   8 +-
 configs/olimex-strp711/ostest/Make.defs       |   8 +-
 configs/qemu-i486/nsh/Make.defs               |   2 +-
 configs/qemu-i486/ostest/Make.defs            |   2 +-
 configs/sam3u-ek/knsh/Make.defs               |   4 +-
 configs/sam3u-ek/nsh/Make.defs                |   4 +-
 configs/sam3u-ek/nx/Make.defs                 |   4 +-
 configs/sam3u-ek/ostest/Make.defs             |   4 +-
 configs/sam3u-ek/touchscreen/Make.defs        |   4 +-
 configs/shenzhou/nsh/Make.defs                |   6 +-
 configs/shenzhou/nxwm/Make.defs               |   6 +-
 configs/skp16c26/README.txt                   | 224 +++---
 configs/skp16c26/ostest/Make.defs             |   2 +-
 configs/stm3210e-eval/RIDE/Make.defs          |   4 +-
 configs/stm3210e-eval/buttons/Make.defs       |   4 +-
 configs/stm3210e-eval/composite/Make.defs     |   4 +-
 configs/stm3210e-eval/nsh/Make.defs           |   4 +-
 configs/stm3210e-eval/nsh2/Make.defs          |   4 +-
 configs/stm3210e-eval/nx/Make.defs            |   4 +-
 configs/stm3210e-eval/nxconsole/Make.defs     |   4 +-
 configs/stm3210e-eval/nxlines/Make.defs       |   4 +-
 configs/stm3210e-eval/nxtext/Make.defs        |   4 +-
 configs/stm3210e-eval/ostest/Make.defs        |   4 +-
 configs/stm3210e-eval/pm/Make.defs            |   4 +-
 configs/stm3210e-eval/usbserial/Make.defs     |   4 +-
 configs/stm3210e-eval/usbstorage/Make.defs    |   4 +-
 configs/stm3220g-eval/dhcpd/Make.defs         |   6 +-
 configs/stm3220g-eval/nettest/Make.defs       |   6 +-
 configs/stm3220g-eval/nsh/Make.defs           |   6 +-
 configs/stm3220g-eval/nsh2/Make.defs          |   6 +-
 configs/stm3220g-eval/nxwm/Make.defs          |   6 +-
 configs/stm3220g-eval/ostest/Make.defs        |   6 +-
 configs/stm3220g-eval/telnetd/Make.defs       |   6 +-
 configs/stm3240g-eval/dhcpd/Make.defs         |   6 +-
 configs/stm3240g-eval/discover/Make.defs      |   6 +-
 configs/stm3240g-eval/nettest/Make.defs       |   6 +-
 configs/stm3240g-eval/nsh/Make.defs           |   6 +-
 configs/stm3240g-eval/nsh2/Make.defs          |   6 +-
 configs/stm3240g-eval/nxconsole/Make.defs     |   6 +-
 configs/stm3240g-eval/nxwm/Make.defs          |   6 +-
 configs/stm3240g-eval/ostest/Make.defs        |   6 +-
 configs/stm3240g-eval/telnetd/Make.defs       |   6 +-
 configs/stm3240g-eval/webserver/Make.defs     |   6 +-
 configs/stm3240g-eval/xmlrpc/Make.defs        |   6 +-
 configs/stm32f4discovery/nsh/Make.defs        |   6 +-
 configs/stm32f4discovery/nxlines/Make.defs    |   6 +-
 configs/stm32f4discovery/ostest/Make.defs     |   6 +-
 configs/stm32f4discovery/pm/Make.defs         |   6 +-
 configs/teensy/hello/Make.defs                |   2 +-
 configs/teensy/nsh/Make.defs                  |   2 +-
 configs/teensy/usbstorage/Make.defs           |   2 +-
 configs/twr-k60n512/nsh/Make.defs             |   4 +-
 configs/twr-k60n512/ostest/Make.defs          |   4 +-
 configs/us7032evb1/nsh/Make.defs              |   2 +-
 configs/us7032evb1/ostest/Make.defs           |   2 +-
 configs/vsn/nsh/Make.defs                     |   4 +-
 160 files changed, 809 insertions(+), 808 deletions(-)

diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index ec6a8be24d..f22ab418c9 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -1309,7 +1309,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>TI TMS320C5471</b> (also called <b>C5471</b> or <b>TMS320DA180</b> or <b>DA180</b>).
       NuttX operates on the ARM7 of this dual core processor.
       This port uses the <a href="http://www.spectrumdigital.com/">Spectrum Digital</a>
-      evaluation board with a GNU arm-elf toolchain* under Linux or Cygwin.
+      evaluation board with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1352,7 +1352,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>NXP LPC214x</b>.
       Support is provided for the NXP LPC214x family of processors.  In particular,
       support is provided for the mcu123.com lpc214x evaluation board (LPC2148).
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1386,7 +1386,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       Support is provided for the NXP LPC2378 MCU.  In particular,
       support is provided for the Olimex-LPC2378 development board.
       This port was contributed by Rommel Marcelo is was first released in NuttX-5.3.
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1413,7 +1413,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>STMicro STR71x</b>.
       Support is provided for the STMicro STR71x family of processors.  In particular,
       support is provided for the Olimex STR-P711 evaluation board.
-      This port also used the GNU arm-elf toolchain* under Linux or Cygwin.
+      This port also used the GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1450,7 +1450,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Freescale MC9328MX1</b> or <b>i.MX1</b>.
-      This port uses the Freescale MX1ADS development board with a GNU arm-elf toolchain*
+      This port uses the Freescale MX1ADS development board with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
     </p>
     <ul>
@@ -1476,7 +1476,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       NuttX operates on the ARM9 of this dual core processor.
       This port uses the
       <a href="http://wiki.neurostechnology.com/index.php/Developer_Welcome">Neuros OSD</a>
-      with a GNU arm-elf toolchain* under Linux or Cygwin.
+      with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
       The port was performed using the OSD v1.0, development board.
     </p>
     <ul>
@@ -1498,7 +1498,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <b>NXP <a href="http://ics.nxp.com/products/lpc3000/lpc313x.lpc314x.lpc315x/">LPC3131</a></b>.
     The port for the NXP LPC3131 on the <a href="http://www.embeddedartists.com/products/kits/lpc3131_kit.php">Embedded Artists EA3131</a> 
-    development board was first released in NuttX-5.1 with a GNU arm-elf or arm-eabi toolchain* under Linux or Cygwin
+    development board was first released in NuttX-5.1 with a GNU arm-nuttx-elf or arm-eabi toolchain* under Linux or Cygwin
     (but was not functional until NuttX-5.2).
     </p>
     <ul>
@@ -1571,7 +1571,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       <b>Luminary/TI Stellaris LM3S6918</b>.
       This port uses the <a href=" http://www.micromint.com/">Micromint</a> Eagle-100 development
-      board with a GNU arm-elf toolchain* under either Linux or Cygwin.
+      board with a GNU arm-nuttx-elf toolchain* under either Linux or Cygwin.
     </p>
     <ul>
       <p>
@@ -1601,7 +1601,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Luminary/TI Stellaris LM3S6965</b>.
-      This port uses the Stellaris LM3S6965 Ethernet Evalution Kit with a GNU arm-elf toolchain*
+      This port uses the Stellaris LM3S6965 Ethernet Evalution Kit with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
     </p>
     <ul>
@@ -1635,7 +1635,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
   <td>
     <p>
       <b>Luminary/TI Stellaris LM3S8962</b>.
-      This port uses the Stellaris EKC-LM3S8962 Ethernet+CAN Evalution Kit with a GNU arm-elf toolchain*
+      This port uses the Stellaris EKC-LM3S8962 Ethernet+CAN Evalution Kit with a GNU arm-nuttx-elf toolchain*
       under either Linux or Cygwin.
       Contributed by Larry Arnold.
     </p>
@@ -1733,7 +1733,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       </li>
     </ol>
     <p>
-      These ports uses a GNU arm-elf toolchain* under either Linux or Cygwin (with native Windows GNU
+      These ports uses a GNU arm-nuttx-elf toolchain* under either Linux or Cygwin (with native Windows GNU
       tools or Cygwin-based GNU tools).
     </p>
     <ul>
@@ -1842,7 +1842,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       <b>Atmel AT91SAM3U</b>.
       This port uses the <a href="http://www.atmel.com/">Atmel</a> SAM3U-EK
       development board that features the AT91SAM3U4E MCU.
-      This port uses a GNU arm-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU
+      This port uses a GNU arm-nuttx-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU
       tools or Cygwin-based GNU tools).
     </p>
     <ul>
@@ -1905,7 +1905,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
     <p>
       The Nucleus 2G board, the mbed board, and the LPCXpresso all feature the NXP LPC1768 MCU;
       the Olimex LPC1766-STK board features an LPC1766.
-      All use a GNU arm-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU tools or Cygwin-based GNU tools).
+      All use a GNU arm-nuttx-elf or arm-eabi toolchain* under either Linux or Cygwin (with native Windows GNU tools or Cygwin-based GNU tools).
     </p>
     <ul>
       <p>
@@ -2386,7 +2386,7 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
       </li>
     </ul>
     <p>
-      Both use a GNU arm-elf toolchain* under Linux or Cygwin.
+      Both use a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
       The NuttX <a href="http://sourceforge.net/projects/nuttx/files/buildroot/">buildroot</a> provides a properly patched GCC 3.4.4 toolchain that is highly optimized for the m9s12x family.
     </p>
     <ul>
@@ -2696,10 +2696,10 @@ svn checkout -r5206 http://svn.code.sf.net/p/nuttx/code/trunk nuttx-code
         <b>STATUS:</b>
         Initial source files released in nuttx-0.4.2.
         At this point, the port has not been integrated;    the target cannot be built
-        because the GNU <code>m16c-elf-ld</code> link fails with  the following message:
+        because the GNU <code>m16c-nuttx-elf-ld</code> link fails with  the following message:
       </p>
       <ul>
-      <code>m32c-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482</code>
+      <code>m32c-nuttx-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482</code>
       </ul>
       <p>Where the reference line is:</p>
       <ul><pre>
@@ -3583,7 +3583,7 @@ buildroot-1.10 2011-05-06 &lt;gnutt@nuttx.org&gt;
       i486 ELF binaries.  But that will not work under Cygwin!  The Cygwin
       toolchain (and probably MinGW), build DOS MZ format executables (i.e.,
       .exe files).  That is probably not usable for most NuttX targets.
-      Instead, you should use this i486-elf-gcc to generate true ELF binaries
+      Instead, you should use this i486-nuttx-elf-gcc to generate true ELF binaries
       under Cygwin.
     * Makefile - Alter copy arguments to avoid permissions problems when
       copying NuttX header files.
diff --git a/Documentation/NuttXLinks.html b/Documentation/NuttXLinks.html
index 7196ea3ea3..b69a354fad 100644
--- a/Documentation/NuttXLinks.html
+++ b/Documentation/NuttXLinks.html
@@ -22,6 +22,7 @@
       <li><a href="http://sourceforge.net/projects/nuttx/develop" target="_top">SourceForge</a></li>
       <li><a href="http://freshmeat.net/projects/nuttx/" target="_top">FreshMeat</a></li>
       <li><a href="http://tech.groups.yahoo.com/group/nuttx/" target="_top">Forum</a></li>
+      <li><a href="https://www.ohloh.net/p/nuttx" target="_top">Ohloh</a></li>
       <li><a href="http://www.oschina.net/p/nuttx" target="_top">OSChina</a></li>
       <li><a href="http://sourceforge.net/projects/nuttx/files/" target="_top">Downloads</a></li>
       <li><a href="http://www.nx-engineering.com/nuttx-wiki/" target="_top">Wiki</a></li>
diff --git a/Documentation/NuttXNxFlat.html b/Documentation/NuttXNxFlat.html
index 6f78fffcd2..73be5d7b34 100644
--- a/Documentation/NuttXNxFlat.html
+++ b/Documentation/NuttXNxFlat.html
@@ -443,7 +443,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
   <tr>
     <td><br></td>
     <td><br></td>
-    <td><code>abc-elf-ld -r -d -warn-common -o $@ $^</code></td>
+    <td><code>abc-nuttx-elf-ld -r -d -warn-common -o $@ $^</code></td>
   </tr>
   <tr>
     <th>Target 2</th>
@@ -464,7 +464,7 @@ cat ../syscall/syscall.csv ../lib/lib.csv | sort >tmp.csv
     <td><br></td>
     <td><br></td>
     <td>
-      <code>abc-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
+      <code>abc-nuttx-elf-ld -r -d -warn-common -T binfmt/libnxflat/gnu-nxflat.ld -no-check-sections -o $@ hello.o hello-thunk.o</code>
     </td>
   </tr>
   <tr>
diff --git a/Documentation/NuttXRelated.html b/Documentation/NuttXRelated.html
index 978eb1d441..9d26a98957 100644
--- a/Documentation/NuttXRelated.html
+++ b/Documentation/NuttXRelated.html
@@ -41,7 +41,7 @@
       <li><a href="http://osmocom.org/" target="top">Osmocom-BB</a></li>
       <li><a href="https://pixhawk.ethz.ch/px4/" target="top">PX4 Autopilot</a></li>
       <li><a href="http://rgmp.sourceforge.net/wiki/index.php/Main_Page" target="top">RGMP</a></li>
-      <li><a href="http://code.google.com/p/tmr/" target="top">Top Multi-Rotor (TMR)</a></li>
+      <li><a href="http://sourceforge.net/projects/tmr-fc/" target="top">Top Multi-Rotor (TMR)</a></li>
   </tr>
   <tr>
     <td align="center" valign="top" width="22">
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index e13c3be621..21ae44144d 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -768,7 +768,7 @@
     This is a port to the Spectrum Digital C5471 evaluation board.  The
     C5471 is a dual core processor from TI with an ARM7TDMI general purpose
     processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180.
-    NuttX runs on the ARM core and is built with with a GNU arm-elf toolchain
+    NuttX runs on the ARM core and is built with with a GNU arm-nuttx-elf toolchain
     under Linux or Cygwin. This port is complete and verified.
   </li>
 
@@ -780,14 +780,14 @@
 
   <li><code>configs/ea3131</code>:
     Embedded Artists EA3131 Development bard.  This board is based on the 
-    an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain.
+    an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain.
     STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/eagle100</code>:
     Micromint Eagle-100 Development board.  This board is based on the 
     an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-    arm-elf toolchain.  STATUS:  This port is complete and mature.
+    arm-nuttx-elf toolchain.  STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/ez80f0910200kitg</code>
@@ -805,7 +805,7 @@
   <li><code>configs/lm3s6965-ek</code>:
     Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
     an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-    arm-elf toolchain.  STATUS:  This port is complete and mature.
+    arm-nuttx-elf toolchain.  STATUS:  This port is complete and mature.
   </li>
 
   <li><code>configs/lm3s8962-ek</code>:
@@ -827,13 +827,13 @@
   <li><code>configs/mbed</code>:
     The configurations in this directory support the mbed board (http://mbed.org)
     that features the NXP LPC1768 microcontroller. This OS is also built
-    with the arm-elf toolchain.  STATUS:  Contributed.
+    with the arm-nuttx-elf toolchain.  STATUS:  Contributed.
   </li>
 
   <li><code>configs/mcu123-lpc214x</code>:
     This port is for the NXP LPC2148 as provided on the mcu123.com
     lpc214x development board.
-    This OS is also built with the arm-elf toolchain* under Linux or Cygwin.
+    This OS is also built with the arm-nuttx-elf toolchain* under Linux or Cygwin.
     The port supports serial, timer0, spi, and usb.
   </li>
 
@@ -858,7 +858,7 @@
   </li>
 
   <li><code>configs/ntosd-dm320</code>:
-    This port uses the Neuros OSD with a GNU arm-elf toolchain* under Linux or Cygwin.
+    This port uses the Neuros OSD with a GNU arm-nuttx-elf toolchain* under Linux or Cygwin.
     See <a href="http://wiki.neurostechnology.com/index.php/Developer_Welcome">Neuros Wiki</a>
     for further information.
     NuttX operates on the ARM9EJS of this dual core processor.
@@ -878,12 +878,12 @@
   </li>
 
   <li><code>configs/olimex-lpc2378</code>:
-    This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain under
+    This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain under
     Linux or Cygwin.  STATUS: ostest and NSH configurations available.
   </li>
 
   <li><code>configs/olimex-strp711</code>:
-    This port uses the Olimex STR-P711 board arm-elf toolchain* under Linux or Cygwin.
+    This port uses the Olimex STR-P711 board arm-nuttx-elf toolchain* under Linux or Cygwin.
     See the <a href="http://www.olimex.com/dev/str-p711.html">Olimex</a> web site
     for further information.
     STATUS: Configurations for the basic OS test and NSH are complete and verified.
diff --git a/Documentation/UsbTrace.html b/Documentation/UsbTrace.html
index ec48e260dd..e85377756e 100644
--- a/Documentation/UsbTrace.html
+++ b/Documentation/UsbTrace.html
@@ -1,332 +1,332 @@
-<html>
-<head>
-<title>NuttX USB Trace Capability</title>
-</head>
-
-<body background="backgd.gif">
-<hr><hr>
-<table width ="100%">
-  <tr align="center" bgcolor="#e4e4e4">
-    <td>
-      <h1><big><font color="#3c34ec"><i>NuttX USB Device Trace</i></font></big></h1>
-      <p>Last Updated: March 20, 2011</p>
-    </td>
-  </tr>
-</table>
-<hr><hr>
-<p><b>USB Device Tracing Controls</b>.
-  The NuttX USB device subsystem supports a fairly sophisticated tracing facility.
-  The basic trace cabability is controlled by these NuttX configuration settings:
-</p>
-<ul>
-  <li><code>CONFIG_USBDEV_TRACE</code>: Enables USB tracing</li>
-  <li><code>CONFIG_USBDEV_TRACE_NRECORDS</code>: Number of trace entries to remember</li>
-</ul>
-<p><b>Trace IDs</b>.
-  The trace facility works like this:
-  When enabled, USB events that occur in either the USB device driver or in the USB class driver are logged.
-  These events are described in <code>include/nuttx/usb/usbdev_trace.h</code>.
-  The logged events are identified by a set of event IDs:
-</p>
-<ul><table>
-  <tr>
-    <td><code>TRACE_INIT_ID</code></td>
-    <td>Initialization events</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_EP_ID</code></td>
-    <td>Endpoint API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_DEV_ID</code></td>
-    <td>USB device API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASS_ID</code></td>
-    <td>USB class driver API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASSAPI_ID</code></td>
-    <td>Other class driver system API calls</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLASSSTATE_ID</code></td>
-    <td>Track class driver state changes</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTENTRY_ID</code></td>
-    <td>Interrupt handler entry</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTDECODE_ID</code></td>
-    <td>Decoded interrupt event</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INTEXIT_ID</code></td>
-    <td>Interrupt handler exit</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_OUTREQQUEUED_ID</code></td>
-    <td>Request queued for OUT endpoint</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_INREQQUEUED_ID</code></td>
-    <td>Request queued for IN endpoint</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_READ_ID</code></td>
-    <td>Read (OUT) action</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_WRITE_ID</code></td>
-    <td>Write (IN) action</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_COMPLETE_ID</code></td>
-    <td>Request completed</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_DEVERROR_ID</code></td>
-    <td>USB controller driver error event</td>
-  </tr>
-  <tr>
-    <td><code>TRACE_CLSERROR_ID</code></td>
-    <td>USB class driver error event</td>
-  </tr>
-</table></ul>
-<p><b>Logged Events</b>.
-  Each logged event is 32-bits in size and includes
-</p>
-<ol>
-  <li>8-bits of the trace ID (values associated with the above)</li>
-  <li>8-bits of additional trace ID data, and</li>
-  <li>16-bits of additonal data.</li>
-</ol>
-<p><b>8-bit Trace Data</b>
-  The 8-bit trace data depends on the specific event ID.  As examples,
-</p>
-<ul>
-  <li>
-    For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. 
-  </li>
-  <li>
-    For the USB device driver, that 8-bit event data is provided within the USB device driver itself.
-    So, for example, the 8-bit event data for the LPC1768 USB device driver is found in <code>arch/arm/src/lpc17xx/lpc17_usbdev.c</code>.
-  </li>
-</ul>
-<p><b>16-bit Trace Data</b>.
-  The 16-bit trace data provided additional context data relevant to the specific logged event.
-</p>
-<p><b>Trace Control Interfaces</b>.
-  Logging of each of these kinds events can be enabled or disabled using the interfaces described in <code>include/nuttx/usb/usbdev_trace.h</code>.
-</p>
-<p><b>Enabling USB Device Tracing</b>.
-  USB device tracing will be configured if <code>CONFIG_USBDEV</code> and either of the following are set in the NuttX configuration file:
-</p>
-<ul>
-  <li><code>CONFIG_USBDEV_TRACE</code>, or</li>
-  <li><code>CONFIG_DEBUG and CONFIG_DEBUG_USB</code></li>
-</ul>
-<p><b>Log Data Sink</b>.
-  The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
-  If <code>CONFIG_USBDEV_TRACE</code> is defined, then the trace data will go to the circular buffer.
-  The size of the circular buffer is determined by <code>CONFIG_USBDEV_TRACE_NRECORDS</code>.
-  Otherwise, the trace data goes to console.
-<p>
-<p><b>Example</b>.
-  Here is an example of USB trace output using <code>apps/examples/usbserial</code> for an LPC1768 platform with the following NuttX configuration settings:
-</p>
-<ul>
-  <li><code>CONFIG_DEBUG</code>, <code>CONFIG_DEBUG_VERBOSE</code>, <code>CONFIG_USB</code>
-  <li><code>CONFIG_EXAMPLES_USBSERIAL_TRACEINIT</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECLASS</code>,
-    <code>CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER</code>,
-    <code>CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS</code>
-</ul>
-<p>Console Output:</p>
-<ul><table>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>ABDE</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Registering USB serial driver</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>uart_register: Registering /dev/ttyUSB0</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Successfully registered the serial driver</code></td>
-  </tr>
-  <tr>
-    <td align="center">1</td>
-    <td align="left"><code>Class API call 1: 0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">2</td>
-    <td align="left"><code>Class error: 19:0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: ERROR: Failed to open /dev/ttyUSB0 for reading: 107</code></td>
-  </tr>
-  <tr>
-    <td align="center">&nbsp;</td>
-    <td align="left"><code>usbserial_main: Not connected. Wait and try again.</code></td>
-  </tr>
-  <tr>
-    <td align="center">3</td>
-    <td align="left"><code>Interrupt 1 entry: 0039</code></td>
-  </tr>
-  <tr>
-    <td align="center">4</td>
-    <td align="left"><code>Interrupt decode 7: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">5</td>
-    <td align="left"><code>Interrupt decode 32: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">6</td>
-    <td align="left"><code>Interrupt decode 6: 0019</code></td>
-  </tr>
-  <tr>
-    <td align="center">7</td>
-    <td align="left"><code>Class disconnect(): 0000</code></td>
-  </tr>
-  <tr>
-    <td align="center">8</td>
-    <td align="left"><code>Device pullup(): 0001</code></td>
-  </tr>
-  <tr>
-    <td align="center">9</td>
-    <td align="left"><code>Interrupt 1 exit: 0000</code></td>
-  </tr>
-</table></ul>
-<p>
-  The numbered items are USB USB trace output.
-  You can look in the file <code>drivers/usbdev/usbdev_trprintf.c</code> to see examctly how each output line is formatted.
-  Here is how each line should be interpreted:
-</p>
-<ul><table>
-  <tr>
-    <th align="center">&nbsp</th>
-    <td align="left">USB EVENT ID</td>
-    <td align="right">8-bit<br>EVENT<br>DATA</td>
-    <td align="left">MEANING</td>
-    <td align="left">16-bit<br>EVENT<br>DATA</td>
-  </tr>
-  <tr>
-    <td align="center">1</td>
-    <td align="left"><code>TRACE_CLASSAPI_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>USBSER_TRACECLASSAPI_SETUP</code><sup>1</sup></td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">2</td>
-    <td align="left"><code>TRACE_CLSERROR_ID</code><sup>1</sup></td>
-    <td align="right">19</td>
-    <td align="left"><code>USBSER_TRACEERR_SETUPNOTCONNECTED</code><sup>1</sup></td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">3</td>
-    <td align="left"><code>TRACE_INTENTRY_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
-    <td align="left">0039</td>
-  </tr>
-  <tr>
-    <td align="center">4</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">7</td>
-    <td align="left"><code>LPC17_TRACEINTID_DEVSTAT</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">5</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">32</td>
-    <td align="left"><code>LPC17_TRACEINTID_SUSPENDCHG</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">6</td>
-    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
-    <td align="right">6</td>
-    <td align="left"><code>LPC17_TRACEINTID_DEVRESET</code><sup>2</sup></td>
-    <td align="left">0019</td>
-  </tr>
-  <tr>
-    <td align="center">7</td>
-    <td align="left"><code>TRACE_CLASS_ID</code><sup>1</sup></td>
-    <td align="right">3</td>
-    <td align="left"><code>(See TRACE_CLASSDISCONNECT</code><sup>1</sup>)</td>
-    <td align="left">0000</td>
-  </tr>
-  <tr>
-    <td align="center">8</td>
-    <td align="left"><code>TRACE_DEV_ID</code><sup>1</sup></td>
-    <td align="right">6</td>
-    <td align="left"><code>(See TRACE_DEVPULLUP</code><sup>1</sup>)</td>
-    <td align="left">0001</td>
-  </tr>
-  <tr>
-    <td align="center">9</td>
-    <td align="left"><code>TRACE_INTEXIT_ID</code><sup>1</sup></td>
-    <td align="right">1</td>
-    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
-    <td align="left">0000</td>
-  </tr>
-</table>
-<p><small><b>NOTES</b>:<br>
-  <sup>1</sup>See <code>include/nuttx/usb/usbdev_trace.h</code><br>
-  <sup>2</sup><code>See arch/arm/src/lpc17xx/lpc17_usbdev.c</code>
-</small></p>
-</ul>
-<p>
-  In the above example you can see that:
-</p>
-<ul>
-  <li><b>1</b>.
-    The serial class USB setup method was called for the USB serial class.
-    This is the corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
-    <ul><pre>
-static int pl2303_setup(FAR struct uart_dev_s *dev)
-{
-  ...
-  usbtrace(PL2303_CLASSAPI_SETUP, 0);
-  ...
-</pre></ul>
-  </li>
-  <li><b>2</b>.
-    An error occurred while processing the setup command because no configuration has yet been selected by the host.
-    This corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
-    <ul><pre>
-static int pl2303_setup(FAR struct uart_dev_s *dev)
-{
-  ...
-  /* Check if we have been configured */
-
-  if (priv->config == PL2303_CONFIGIDNONE)
-    {
-      usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
-      return -ENOTCONN;
-    }
-  ...
-</pre></ul>
-  <li><b>3-6</b>.
-    Here is a USB interrupt that suspends and resets the device.
-  </li>
-  <li><b>7-8</b>.
-    During the interrupt processing the serial class is disconnected
-  </li>
-  <li><b>9</b>.
-    And the interrupt returns
-  </li>
-</ul>
-</body>
-</html>
+<html>
+<head>
+<title>NuttX USB Trace Capability</title>
+</head>
+
+<body background="backgd.gif">
+<hr><hr>
+<table width ="100%">
+  <tr align="center" bgcolor="#e4e4e4">
+    <td>
+      <h1><big><font color="#3c34ec"><i>NuttX USB Device Trace</i></font></big></h1>
+      <p>Last Updated: March 20, 2011</p>
+    </td>
+  </tr>
+</table>
+<hr><hr>
+<p><b>USB Device Tracing Controls</b>.
+  The NuttX USB device subsystem supports a fairly sophisticated tracing facility.
+  The basic trace cabability is controlled by these NuttX configuration settings:
+</p>
+<ul>
+  <li><code>CONFIG_USBDEV_TRACE</code>: Enables USB tracing</li>
+  <li><code>CONFIG_USBDEV_TRACE_NRECORDS</code>: Number of trace entries to remember</li>
+</ul>
+<p><b>Trace IDs</b>.
+  The trace facility works like this:
+  When enabled, USB events that occur in either the USB device driver or in the USB class driver are logged.
+  These events are described in <code>include/nuttx/usb/usbdev_trace.h</code>.
+  The logged events are identified by a set of event IDs:
+</p>
+<ul><table>
+  <tr>
+    <td><code>TRACE_INIT_ID</code></td>
+    <td>Initialization events</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_EP_ID</code></td>
+    <td>Endpoint API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_DEV_ID</code></td>
+    <td>USB device API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASS_ID</code></td>
+    <td>USB class driver API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASSAPI_ID</code></td>
+    <td>Other class driver system API calls</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLASSSTATE_ID</code></td>
+    <td>Track class driver state changes</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTENTRY_ID</code></td>
+    <td>Interrupt handler entry</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTDECODE_ID</code></td>
+    <td>Decoded interrupt event</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INTEXIT_ID</code></td>
+    <td>Interrupt handler exit</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_OUTREQQUEUED_ID</code></td>
+    <td>Request queued for OUT endpoint</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_INREQQUEUED_ID</code></td>
+    <td>Request queued for IN endpoint</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_READ_ID</code></td>
+    <td>Read (OUT) action</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_WRITE_ID</code></td>
+    <td>Write (IN) action</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_COMPLETE_ID</code></td>
+    <td>Request completed</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_DEVERROR_ID</code></td>
+    <td>USB controller driver error event</td>
+  </tr>
+  <tr>
+    <td><code>TRACE_CLSERROR_ID</code></td>
+    <td>USB class driver error event</td>
+  </tr>
+</table></ul>
+<p><b>Logged Events</b>.
+  Each logged event is 32-bits in size and includes
+</p>
+<ol>
+  <li>8-bits of the trace ID (values associated with the above)</li>
+  <li>8-bits of additional trace ID data, and</li>
+  <li>16-bits of additonal data.</li>
+</ol>
+<p><b>8-bit Trace Data</b>
+  The 8-bit trace data depends on the specific event ID.  As examples,
+</p>
+<ul>
+  <li>
+    For the USB serial and mass storage class, the 8-bit event data is provided in <code>include/nuttx/usb/usbdev_trace.h</code>. 
+  </li>
+  <li>
+    For the USB device driver, that 8-bit event data is provided within the USB device driver itself.
+    So, for example, the 8-bit event data for the LPC1768 USB device driver is found in <code>arch/arm/src/lpc17xx/lpc17_usbdev.c</code>.
+  </li>
+</ul>
+<p><b>16-bit Trace Data</b>.
+  The 16-bit trace data provided additional context data relevant to the specific logged event.
+</p>
+<p><b>Trace Control Interfaces</b>.
+  Logging of each of these kinds events can be enabled or disabled using the interfaces described in <code>include/nuttx/usb/usbdev_trace.h</code>.
+</p>
+<p><b>Enabling USB Device Tracing</b>.
+  USB device tracing will be configured if <code>CONFIG_USBDEV</code> and either of the following are set in the NuttX configuration file:
+</p>
+<ul>
+  <li><code>CONFIG_USBDEV_TRACE</code>, or</li>
+  <li><code>CONFIG_DEBUG and CONFIG_DEBUG_USB</code></li>
+</ul>
+<p><b>Log Data Sink</b>.
+  The logged data itself may go to either (1) an internal circular buffer, or (2) may be provided on the console.
+  If <code>CONFIG_USBDEV_TRACE</code> is defined, then the trace data will go to the circular buffer.
+  The size of the circular buffer is determined by <code>CONFIG_USBDEV_TRACE_NRECORDS</code>.
+  Otherwise, the trace data goes to console.
+<p>
+<p><b>Example</b>.
+  Here is an example of USB trace output using <code>apps/examples/usbserial</code> for an LPC1768 platform with the following NuttX configuration settings:
+</p>
+<ul>
+  <li><code>CONFIG_DEBUG</code>, <code>CONFIG_DEBUG_VERBOSE</code>, <code>CONFIG_USB</code>
+  <li><code>CONFIG_EXAMPLES_USBSERIAL_TRACEINIT</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECLASS</code>,
+    <code>CONFIG_EXAMPLES_USBSERIAL_TRACETRANSFERS</code>, <code>CONFIG_EXAMPLES_USBSERIAL_TRACECONTROLLER</code>,
+    <code>CONFIG_EXAMPLES_USBSERIAL_TRACEINTERRUPTS</code>
+</ul>
+<p>Console Output:</p>
+<ul><table>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>ABDE</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Registering USB serial driver</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>uart_register: Registering /dev/ttyUSB0</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Successfully registered the serial driver</code></td>
+  </tr>
+  <tr>
+    <td align="center">1</td>
+    <td align="left"><code>Class API call 1: 0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">2</td>
+    <td align="left"><code>Class error: 19:0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: ERROR: Failed to open /dev/ttyUSB0 for reading: 107</code></td>
+  </tr>
+  <tr>
+    <td align="center">&nbsp;</td>
+    <td align="left"><code>usbserial_main: Not connected. Wait and try again.</code></td>
+  </tr>
+  <tr>
+    <td align="center">3</td>
+    <td align="left"><code>Interrupt 1 entry: 0039</code></td>
+  </tr>
+  <tr>
+    <td align="center">4</td>
+    <td align="left"><code>Interrupt decode 7: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">5</td>
+    <td align="left"><code>Interrupt decode 32: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">6</td>
+    <td align="left"><code>Interrupt decode 6: 0019</code></td>
+  </tr>
+  <tr>
+    <td align="center">7</td>
+    <td align="left"><code>Class disconnect(): 0000</code></td>
+  </tr>
+  <tr>
+    <td align="center">8</td>
+    <td align="left"><code>Device pullup(): 0001</code></td>
+  </tr>
+  <tr>
+    <td align="center">9</td>
+    <td align="left"><code>Interrupt 1 exit: 0000</code></td>
+  </tr>
+</table></ul>
+<p>
+  The numbered items are USB USB trace output.
+  You can look in the file <code>drivers/usbdev/usbdev_trprintf.c</code> to see examctly how each output line is formatted.
+  Here is how each line should be interpreted:
+</p>
+<ul><table>
+  <tr>
+    <th align="center">&nbsp</th>
+    <td align="left">USB EVENT ID</td>
+    <td align="right">8-bit<br>EVENT<br>DATA</td>
+    <td align="left">MEANING</td>
+    <td align="left">16-bit<br>EVENT<br>DATA</td>
+  </tr>
+  <tr>
+    <td align="center">1</td>
+    <td align="left"><code>TRACE_CLASSAPI_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>USBSER_TRACECLASSAPI_SETUP</code><sup>1</sup></td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">2</td>
+    <td align="left"><code>TRACE_CLSERROR_ID</code><sup>1</sup></td>
+    <td align="right">19</td>
+    <td align="left"><code>USBSER_TRACEERR_SETUPNOTCONNECTED</code><sup>1</sup></td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">3</td>
+    <td align="left"><code>TRACE_INTENTRY_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
+    <td align="left">0039</td>
+  </tr>
+  <tr>
+    <td align="center">4</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">7</td>
+    <td align="left"><code>LPC17_TRACEINTID_DEVSTAT</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">5</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">32</td>
+    <td align="left"><code>LPC17_TRACEINTID_SUSPENDCHG</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">6</td>
+    <td align="left"><code>TRACE_INTDECODE_ID</code><sup>2</sup></td>
+    <td align="right">6</td>
+    <td align="left"><code>LPC17_TRACEINTID_DEVRESET</code><sup>2</sup></td>
+    <td align="left">0019</td>
+  </tr>
+  <tr>
+    <td align="center">7</td>
+    <td align="left"><code>TRACE_CLASS_ID</code><sup>1</sup></td>
+    <td align="right">3</td>
+    <td align="left"><code>(See TRACE_CLASSDISCONNECT</code><sup>1</sup>)</td>
+    <td align="left">0000</td>
+  </tr>
+  <tr>
+    <td align="center">8</td>
+    <td align="left"><code>TRACE_DEV_ID</code><sup>1</sup></td>
+    <td align="right">6</td>
+    <td align="left"><code>(See TRACE_DEVPULLUP</code><sup>1</sup>)</td>
+    <td align="left">0001</td>
+  </tr>
+  <tr>
+    <td align="center">9</td>
+    <td align="left"><code>TRACE_INTEXIT_ID</code><sup>1</sup></td>
+    <td align="right">1</td>
+    <td align="left"><code>LPC17_TRACEINTID_USB</code><sup>2</sup></td>
+    <td align="left">0000</td>
+  </tr>
+</table>
+<p><small><b>NOTES</b>:<br>
+  <sup>1</sup>See <code>include/nuttx/usb/usbdev_trace.h</code><br>
+  <sup>2</sup><code>See arch/arm/src/lpc17xx/lpc17_usbdev.c</code>
+</small></p>
+</ul>
+<p>
+  In the above example you can see that:
+</p>
+<ul>
+  <li><b>1</b>.
+    The serial class USB setup method was called for the USB serial class.
+    This is the corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
+    <ul><pre>
+static int pl2303_setup(FAR struct uart_dev_s *dev)
+{
+  ...
+  usbtrace(PL2303_CLASSAPI_SETUP, 0);
+  ...
+</pre></ul>
+  </li>
+  <li><b>2</b>.
+    An error occurred while processing the setup command because no configuration has yet been selected by the host.
+    This corresponds to the following logic in <code>drivers/usbdev/pl2303.c</code>:
+    <ul><pre>
+static int pl2303_setup(FAR struct uart_dev_s *dev)
+{
+  ...
+  /* Check if we have been configured */
+
+  if (priv->config == PL2303_CONFIGIDNONE)
+    {
+      usbtrace(TRACE_CLSERROR(USBSER_TRACEERR_SETUPNOTCONNECTED), 0);
+      return -ENOTCONN;
+    }
+  ...
+</pre></ul>
+  <li><b>3-6</b>.
+    Here is a USB interrupt that suspends and resets the device.
+  </li>
+  <li><b>7-8</b>.
+    During the interrupt processing the serial class is disconnected
+  </li>
+  <li><b>9</b>.
+    And the interrupt returns
+  </li>
+</ul>
+</body>
+</html>
diff --git a/configs/Kconfig b/configs/Kconfig
index 752a5b0983..600e74ef44 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -42,7 +42,7 @@ config ARCH_BOARD_C5471EVM
 		This is a port to the Spectrum Digital C5471 evaluation board.  The
 		TMS320C5471 is a dual core processor from TI with an ARM7TDMI general
 		purpose processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180. 
-		NuttX runs on the ARM core and is built with a GNU arm-elf toolchain*.
+		NuttX runs on the ARM core and is built with a GNU arm-nuttx-elf toolchain*.
 		This port is complete and verified.
 
 config ARCH_BOARD_COMPALE88
@@ -80,7 +80,7 @@ config ARCH_BOARD_EA3131
 	select ARCH_HAVE_BUTTONS
 	---help---
 		Embedded Artists EA3131 Development board.  This board is based on the 
-		an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain*.
+		an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain*.
 		STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_EA3152
@@ -90,7 +90,7 @@ config ARCH_BOARD_EA3152
 	select ARCH_HAVE_BUTTONS
 	---help---
 		Embedded Artists EA3152 Development board.  This board is based on the 
-		an NXP LPC3152 MCU. This OS is built with the arm-elf toolchain*.
+		an NXP LPC3152 MCU. This OS is built with the arm-nuttx-elf toolchain*.
 		STATUS:  This port is has not be exercised well, but since it is
 		a simple derivative of the ea3131, it should be fully functional.
 
@@ -101,7 +101,7 @@ config ARCH_BOARD_EAGLE100
 	---help---
 		Micromint Eagle-100 Development board.  This board is based on the 
 		an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
+		arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_EKK_LM3S9B96
 	bool "TI/Stellaris EKK-LM3S9B96"
@@ -184,7 +184,7 @@ config ARCH_BOARD_LM3S6965EK
 	---help---
 		Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
 		an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-		arm-elf toolchain*.  STATUS:  This port is complete and mature.
+		arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 config ARCH_BOARD_LM3S8962EK
 	bool "Stellaris LMS38962 Evaluation Kit"
@@ -215,7 +215,7 @@ config ARCH_BOARD_M68332EVB
 	depends on ARCH_M68332
 	---help---
 		This is a work in progress for the venerable m68322evb board from
-		Motorola. This OS is also built with the arm-elf toolchain.  STATUS:
+		Motorola. This OS is also built with the arm-nuttx-elf toolchain.  STATUS:
 		This port was never completed.
 
 config ARCH_BOARD_MBED
@@ -225,7 +225,7 @@ config ARCH_BOARD_MBED
 	---help---
 		The configurations in this directory support the mbed board (http://mbed.org)
 		that features the NXP LPC1768 microcontroller. This OS is also built
-		with the arm-elf toolchain*.  STATUS:  Contributed.
+		with the arm-nuttx-elf toolchain*.  STATUS:  Contributed.
 
 config ARCH_BOARD_MCU123
 	bool "mcu123.com LPC2148 Development Board"
@@ -233,7 +233,7 @@ config ARCH_BOARD_MCU123
 	select ARCH_HAVE_LEDS
 	---help---
 		This port is for the NXP LPC2148 as provided on the mcu123.com
-		lpc214x development board. This OS is also built with the arm-elf
+		lpc214x development board. This OS is also built with the arm-nuttx-elf
 		toolchain*.  The port supports serial, timer0, spi, and usb.
 
 config ARCH_BOARD_MICROPENDOUS3
@@ -270,7 +270,7 @@ config ARCH_BOARD_NTOSD_DM320
 	depends on ARCH_CHIP_DM320
 	select ARCH_HAVE_LEDS
 	---help---
-		This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-elf
+		This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-nuttx-elf
 		toolchain*: see
 
 			http://wiki.neurostechnology.com/index.php/OSD_1.0_Developer_Home
@@ -316,7 +316,7 @@ config ARCH_BOARD_OLIMEXLPC2378
 	depends on ARCH_CHIP_LPC2378
 	select ARCH_HAVE_LEDS
 	---help---
-		This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin.  STATUS: ostest and NSH configurations available.
 		This port for the NXP LPC2378 was contributed by Rommel Marcelo.
 
@@ -326,7 +326,7 @@ config ARCH_BOARD_OLIMEX_STRP711
 	select ARCH_HAVE_LEDS
 	select ARCH_HAVE_BUTTONS
 	---help---
-		This port uses the Olimex STR-P711 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex STR-P711 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.olimex.com/dev/str-p711.html" for
 		further information.  STATUS: Configurations for the basic OS test and NSH
 		are complete and verified.
@@ -335,7 +335,7 @@ config ARCH_BOARD_OLIMEX_STM32P107
 	bool "Olimex STM32 P107 board"
 	depends on ARCH_CHIP_STM32F107VC
 	---help---
-		This port uses the Olimex STM32 P107 board and a GNU arm-elf toolchain* under
+		This port uses the Olimex STM32 P107 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.olimex.com for further information. This
 		board features the STMicro STM32F107VC MCU
 
@@ -411,7 +411,7 @@ config ARCH_BOARD_SHENZHOU
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		This port uses the Shenzhou STM32 F107 board and a GNU arm-elf toolchain* under
+		This port uses the Shenzhou STM32 F107 board and a GNU arm-nuttx-elf toolchain* under
 		Linux or Cygwin. See the http://www.armjishu.com for further information. This
 		board features the STMicro STM32F107VC MCU
 
diff --git a/configs/README.txt b/configs/README.txt
index 5bbec874f7..e6bde645d1 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -1524,7 +1524,7 @@ configs/c5471evm
   This is a port to the Spectrum Digital C5471 evaluation board.  The
   TMS320C5471 is a dual core processor from TI with an ARM7TDMI general
   purpose processor and a c54 DSP.  It is also known as TMS320DA180 or just DA180. 
-  NuttX runs on the ARM core and is built with a GNU arm-elf toolchain*.
+  NuttX runs on the ARM core and is built with a GNU arm-nuttx-elf toolchain*.
   This port is complete and verified.
 
 configs/compal_e88 and compal_e99
@@ -1540,19 +1540,19 @@ configs/demo9s12ne64
 
 configs/ea3131
   Embedded Artists EA3131 Development board.  This board is based on the 
-  an NXP LPC3131 MCU. This OS is built with the arm-elf toolchain*.
+  an NXP LPC3131 MCU. This OS is built with the arm-nuttx-elf toolchain*.
   STATUS:  This port is complete and mature.
 
 configs/ea3152
   Embedded Artists EA3152 Development board.  This board is based on the 
-  an NXP LPC3152 MCU. This OS is built with the arm-elf toolchain*.
+  an NXP LPC3152 MCU. This OS is built with the arm-nuttx-elf toolchain*.
   STATUS:  This port is has not be exercised well, but since it is
   a simple derivative of the ea3131, it should be fully functional.
 
 configs/eagle100
   Micromint Eagle-100 Development board.  This board is based on the 
   an ARM Cortex-M3 MCU, the Luminary LM3S6918. This OS is built with the
-  arm-elf toolchain*.  STATUS:  This port is complete and mature.
+  arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 configs/ekk-lm3s9b96
   TI/Stellaris EKK-LM3S9B96 board.  This board is based on the 
@@ -1591,7 +1591,7 @@ configs/lm3s6432-s2e
 configs/lm3s6965-ek
   Stellaris LM3S6965 Evaluation Kit.  This board is based on the 
   an ARM Cortex-M3 MCU, the Luminary/TI LM3S6965. This OS is built with the
-  arm-elf toolchain*.  STATUS:  This port is complete and mature.
+  arm-nuttx-elf toolchain*.  STATUS:  This port is complete and mature.
 
 configs/lm3s8962-ek
   Stellaris LMS38962 Evaluation Kit.
@@ -1607,17 +1607,17 @@ configs/lpc4330-xplorer
 
 configs/m68322evb
   This is a work in progress for the venerable m68322evb board from
-  Motorola. This OS is also built with the arm-elf toolchain*.  STATUS:
+  Motorola. This OS is also built with the arm-nuttx-elf toolchain*.  STATUS:
   This port was never completed.
 
 configs/mbed
   The configurations in this directory support the mbed board (http://mbed.org)
   that features the NXP LPC1768 microcontroller. This OS is also built
-  with the arm-elf toolchain*.  STATUS:  Contributed.
+  with the arm-nuttx-elf toolchain*.  STATUS:  Contributed.
 
 configs/mcu123-lpc214x
   This port is for the NXP LPC2148 as provided on the mcu123.com
-  lpc214x development board. This OS is also built with the arm-elf
+  lpc214x development board. This OS is also built with the arm-nuttx-elf
   toolchain*.  The port supports serial, timer0, spi, and usb.
 
 configs/micropendous3
@@ -1642,7 +1642,7 @@ configs/ne64badge
   not yet been fully tested.
 
 configs/ntosd-dm320
-  This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-elf
+  This port uses the Neuros OSD v1.0 Dev Board with a GNU arm-nuttx-elf
   toolchain*: see
 
     http://wiki.neurostechnology.com/index.php/OSD_1.0_Developer_Home
@@ -1666,18 +1666,18 @@ configs/olimex-lpc1766stk
   Linux or Cygwin.  STATUS: Complete and mature.
 
 configs/olimex-lpc2378
-  This port uses the Olimex-lpc2378 board and a GNU arm-elf toolchain* under
+  This port uses the Olimex-lpc2378 board and a GNU arm-nuttx-elf toolchain* under
   Linux or Cygwin.  STATUS: ostest and NSH configurations available.
   This port for the NXP LPC2378 was contributed by Rommel Marcelo.
 
 configs/olimex-stm32-p107
-  This port uses the Olimex STM32-P107 board (STM32F107VC) and a GNU arm-elf
+  This port uses the Olimex STM32-P107 board (STM32F107VC) and a GNU arm-nuttx-elf
   toolchain* under Linux or Cygwin. See the https://www.olimex.com/dev/stm32-p107.html
   for further information.  Contributed by Max Holtzberg.  STATUS: Configurations
   for the basic OS test and NSH are available and verified.
 
 configs/olimex-strp711
-  This port uses the Olimex STR-P711 board and a GNU arm-elf toolchain* under
+  This port uses the Olimex STR-P711 board and a GNU arm-nuttx-elf toolchain* under
   Linux or Cygwin. See the http://www.olimex.com/dev/str-p711.html" for
   further information.  STATUS: Configurations for the basic OS test and NSH
   are complete and verified.
diff --git a/configs/amber/hello/Make.defs b/configs/amber/hello/Make.defs
index 4474e1621d..66f3ff7993 100644
--- a/configs/amber/hello/Make.defs
+++ b/configs/amber/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=atmega128
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/configs/c5471evm/httpd/Make.defs b/configs/c5471evm/httpd/Make.defs
index 6ff007708f..ffc267530d 100644
--- a/configs/c5471evm/httpd/Make.defs
+++ b/configs/c5471evm/httpd/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/c5471evm/nettest/Make.defs b/configs/c5471evm/nettest/Make.defs
index d66bb564fb..e784c11194 100644
--- a/configs/c5471evm/nettest/Make.defs
+++ b/configs/c5471evm/nettest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/c5471evm/nsh/Make.defs b/configs/c5471evm/nsh/Make.defs
index 2ffb69ffd3..d9e569158b 100644
--- a/configs/c5471evm/nsh/Make.defs
+++ b/configs/c5471evm/nsh/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/c5471evm/ostest/Make.defs b/configs/c5471evm/ostest/Make.defs
index 04d6e09713..9cbfc1d1d5 100644
--- a/configs/c5471evm/ostest/Make.defs
+++ b/configs/c5471evm/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/compal_e88/nsh_highram/Make.defs b/configs/compal_e88/nsh_highram/Make.defs
index b3c04930db..e99d5635d0 100644
--- a/configs/compal_e88/nsh_highram/Make.defs
+++ b/configs/compal_e88/nsh_highram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/compal_e99/nsh_compalram/Make.defs b/configs/compal_e99/nsh_compalram/Make.defs
index cec8bdd1fb..4759fc76a4 100644
--- a/configs/compal_e99/nsh_compalram/Make.defs
+++ b/configs/compal_e99/nsh_compalram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/compal_e99/nsh_highram/Make.defs b/configs/compal_e99/nsh_highram/Make.defs
index b3c04930db..e99d5635d0 100644
--- a/configs/compal_e99/nsh_highram/Make.defs
+++ b/configs/compal_e99/nsh_highram/Make.defs
@@ -45,7 +45,7 @@ EXTRA_LIBS		= $(OSMODIR)/src/target/firmware/comm/libcomm.a \
 			# ^^^ Stupid hack! Why do I have to put it twice???
 endif
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/demo9s12ne64/ostest/Make.defs b/configs/demo9s12ne64/ostest/Make.defs
index 9ad5036c3f..727ebb5614 100644
--- a/configs/demo9s12ne64/ostest/Make.defs
+++ b/configs/demo9s12ne64/ostest/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
 # Setup for the selected toolchain
 # NuttX buildroot under Linux or Cygwin
 
-CROSSDEV = m9s12x-elf-
+CROSSDEV = m9s12x-nuttx-elf-
 MAXOPTIMIZATION = -Os
 WINTOOL = n
 
diff --git a/configs/ea3131/README.txt b/configs/ea3131/README.txt
index c237345d14..a99011ec5b 100644
--- a/configs/ea3131/README.txt
+++ b/configs/ea3131/README.txt
@@ -265,7 +265,7 @@ Using OpenOCD and GDB
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file:
diff --git a/configs/ea3131/nsh/Make.defs b/configs/ea3131/nsh/Make.defs
index 9ef28c3636..cd49f56af7 100644
--- a/configs/ea3131/nsh/Make.defs
+++ b/configs/ea3131/nsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ea3131/ostest/Make.defs b/configs/ea3131/ostest/Make.defs
index 3528b80b5d..f07f4d4529 100644
--- a/configs/ea3131/ostest/Make.defs
+++ b/configs/ea3131/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ea3131/pgnsh/Make.defs b/configs/ea3131/pgnsh/Make.defs
index 7dace9854a..1097a8d728 100644
--- a/configs/ea3131/pgnsh/Make.defs
+++ b/configs/ea3131/pgnsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ea3131/usbserial/Make.defs b/configs/ea3131/usbserial/Make.defs
index eb0da53f55..3fe5f8f931 100644
--- a/configs/ea3131/usbserial/Make.defs
+++ b/configs/ea3131/usbserial/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ea3131/usbstorage/Make.defs b/configs/ea3131/usbstorage/Make.defs
index fc679e24ca..de351b2567 100644
--- a/configs/ea3131/usbstorage/Make.defs
+++ b/configs/ea3131/usbstorage/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ea3152/README.txt b/configs/ea3152/README.txt
index 90be2a2201..5b6eb17a93 100644
--- a/configs/ea3152/README.txt
+++ b/configs/ea3152/README.txt
@@ -264,7 +264,7 @@ Using OpenOCD and GDB
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file:
diff --git a/configs/ea3152/ostest/Make.defs b/configs/ea3152/ostest/Make.defs
index 8872b60e41..9bb350e36c 100644
--- a/configs/ea3152/ostest/Make.defs
+++ b/configs/ea3152/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC31_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC31_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/eagle100/README.txt b/configs/eagle100/README.txt
index e03a92d5c6..47c4f89df0 100644
--- a/configs/eagle100/README.txt
+++ b/configs/eagle100/README.txt
@@ -36,7 +36,7 @@ GNU Toolchain Options
      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-elf-       # Will build for the NuttX buildroot toolchain
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
diff --git a/configs/eagle100/httpd/Make.defs b/configs/eagle100/httpd/Make.defs
index 1b6dc01cf0..8d3cc9c25f 100644
--- a/configs/eagle100/httpd/Make.defs
+++ b/configs/eagle100/httpd/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ OBJDUMP			= $(CROSSDEV)objdump
 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/eagle100/nettest/Make.defs b/configs/eagle100/nettest/Make.defs
index ef761182f3..ca50492828 100644
--- a/configs/eagle100/nettest/Make.defs
+++ b/configs/eagle100/nettest/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ OBJDUMP			= $(CROSSDEV)objdump
 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/eagle100/nsh/Make.defs b/configs/eagle100/nsh/Make.defs
index 4f024e2636..4992994951 100644
--- a/configs/eagle100/nsh/Make.defs
+++ b/configs/eagle100/nsh/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ OBJDUMP			= $(CROSSDEV)objdump
 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/eagle100/nxflat/Make.defs b/configs/eagle100/nxflat/Make.defs
index d3107f1126..d735c3942a 100644
--- a/configs/eagle100/nxflat/Make.defs
+++ b/configs/eagle100/nxflat/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -58,7 +58,7 @@ 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -109,7 +109,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/eagle100/ostest/Make.defs b/configs/eagle100/ostest/Make.defs
index 7dd98c21af..641fcbaba2 100644
--- a/configs/eagle100/ostest/Make.defs
+++ b/configs/eagle100/ostest/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -55,7 +55,7 @@ OBJDUMP			= $(CROSSDEV)objdump
 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -106,7 +106,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/eagle100/thttpd/Make.defs b/configs/eagle100/thttpd/Make.defs
index a864867e72..999db3a591 100644
--- a/configs/eagle100/thttpd/Make.defs
+++ b/configs/eagle100/thttpd/Make.defs
@@ -40,7 +40,7 @@ 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-eabi-
 CC			= $(CROSSDEV)gcc
@@ -58,7 +58,7 @@ 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}
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
@@ -109,7 +109,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/ekk-lm3s9b96/nsh/Make.defs b/configs/ekk-lm3s9b96/nsh/Make.defs
index a4223e5137..1be7fc8f0b 100644
--- a/configs/ekk-lm3s9b96/nsh/Make.defs
+++ b/configs/ekk-lm3s9b96/nsh/Make.defs
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -121,7 +121,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/ekk-lm3s9b96/ostest/Make.defs b/configs/ekk-lm3s9b96/ostest/Make.defs
index 2da0c421a6..e0fae20f0f 100644
--- a/configs/ekk-lm3s9b96/ostest/Make.defs
+++ b/configs/ekk-lm3s9b96/ostest/Make.defs
@@ -59,7 +59,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -121,7 +121,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/fire-stm32v2/nsh/Make.defs b/configs/fire-stm32v2/nsh/Make.defs
index 567e820639..aaf0e8980c 100644
--- a/configs/fire-stm32v2/nsh/Make.defs
+++ b/configs/fire-stm32v2/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/buttons/Make.defs b/configs/hymini-stm32v/buttons/Make.defs
index f78c3aed35..bcc1f6845f 100644
--- a/configs/hymini-stm32v/buttons/Make.defs
+++ b/configs/hymini-stm32v/buttons/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/nsh/Make.defs b/configs/hymini-stm32v/nsh/Make.defs
index 91aa063835..fae6edc080 100644
--- a/configs/hymini-stm32v/nsh/Make.defs
+++ b/configs/hymini-stm32v/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/nsh2/Make.defs b/configs/hymini-stm32v/nsh2/Make.defs
index f5c9d11c69..1cf89238ea 100644
--- a/configs/hymini-stm32v/nsh2/Make.defs
+++ b/configs/hymini-stm32v/nsh2/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/nx/Make.defs b/configs/hymini-stm32v/nx/Make.defs
index ac140b3543..8ebded0944 100644
--- a/configs/hymini-stm32v/nx/Make.defs
+++ b/configs/hymini-stm32v/nx/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/nxlines/Make.defs b/configs/hymini-stm32v/nxlines/Make.defs
index 897af1fcd8..15521d6212 100644
--- a/configs/hymini-stm32v/nxlines/Make.defs
+++ b/configs/hymini-stm32v/nxlines/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/usbserial/Make.defs b/configs/hymini-stm32v/usbserial/Make.defs
index 29be9190fe..b58c4c1fe1 100644
--- a/configs/hymini-stm32v/usbserial/Make.defs
+++ b/configs/hymini-stm32v/usbserial/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/hymini-stm32v/usbstorage/Make.defs b/configs/hymini-stm32v/usbstorage/Make.defs
index 3e89daa6d2..f3264ab937 100644
--- a/configs/hymini-stm32v/usbstorage/Make.defs
+++ b/configs/hymini-stm32v/usbstorage/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/kwikstik-k40/ostest/Make.defs b/configs/kwikstik-k40/ostest/Make.defs
index 0f03b6c19d..43a5dd01e0 100644
--- a/configs/kwikstik-k40/ostest/Make.defs
+++ b/configs/kwikstik-k40/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lincoln60/nsh/Make.defs b/configs/lincoln60/nsh/Make.defs
index cca519da40..9750a0e87c 100644
--- a/configs/lincoln60/nsh/Make.defs
+++ b/configs/lincoln60/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lincoln60/ostest/Make.defs b/configs/lincoln60/ostest/Make.defs
index 29ef7c3277..c90939429b 100644
--- a/configs/lincoln60/ostest/Make.defs
+++ b/configs/lincoln60/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s6432-s2e/nsh/Make.defs b/configs/lm3s6432-s2e/nsh/Make.defs
index 3bac1a4dbf..ef39674b2a 100644
--- a/configs/lm3s6432-s2e/nsh/Make.defs
+++ b/configs/lm3s6432-s2e/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s6432-s2e/ostest/Make.defs b/configs/lm3s6432-s2e/ostest/Make.defs
index 7d528cdf0f..6036891832 100644
--- a/configs/lm3s6432-s2e/ostest/Make.defs
+++ b/configs/lm3s6432-s2e/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s6965-ek/nsh/Make.defs b/configs/lm3s6965-ek/nsh/Make.defs
index 52a3c7bd1b..17df0ebf7b 100644
--- a/configs/lm3s6965-ek/nsh/Make.defs
+++ b/configs/lm3s6965-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s6965-ek/nx/Make.defs b/configs/lm3s6965-ek/nx/Make.defs
index 21b60450f6..5ab0cfd260 100644
--- a/configs/lm3s6965-ek/nx/Make.defs
+++ b/configs/lm3s6965-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s6965-ek/ostest/Make.defs b/configs/lm3s6965-ek/ostest/Make.defs
index a834a57ef0..5e49273a0c 100644
--- a/configs/lm3s6965-ek/ostest/Make.defs
+++ b/configs/lm3s6965-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s8962-ek/nsh/Make.defs b/configs/lm3s8962-ek/nsh/Make.defs
index c37875c642..cc7bce1e5c 100644
--- a/configs/lm3s8962-ek/nsh/Make.defs
+++ b/configs/lm3s8962-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s8962-ek/nx/Make.defs b/configs/lm3s8962-ek/nx/Make.defs
index be150074cc..b97aaa31ec 100644
--- a/configs/lm3s8962-ek/nx/Make.defs
+++ b/configs/lm3s8962-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lm3s8962-ek/ostest/Make.defs b/configs/lm3s8962-ek/ostest/Make.defs
index 43bcfcddde..4b4863d7cb 100644
--- a/configs/lm3s8962-ek/ostest/Make.defs
+++ b/configs/lm3s8962-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LM3S_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LM3S_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpc4330-xplorer/nsh/Make.defs b/configs/lpc4330-xplorer/nsh/Make.defs
index 341671a977..960fb2a41a 100644
--- a/configs/lpc4330-xplorer/nsh/Make.defs
+++ b/configs/lpc4330-xplorer/nsh/Make.defs
@@ -93,8 +93,8 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -176,7 +176,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpc4330-xplorer/ostest/Make.defs b/configs/lpc4330-xplorer/ostest/Make.defs
index 341671a977..960fb2a41a 100644
--- a/configs/lpc4330-xplorer/ostest/Make.defs
+++ b/configs/lpc4330-xplorer/ostest/Make.defs
@@ -93,8 +93,8 @@ ifeq ($(CONFIG_LPC43_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC43_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m4 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -176,7 +176,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/dhcpd/Make.defs b/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
index 8ece92ca9c..804e20ecd1 100644
--- a/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
+++ b/configs/lpcxpresso-lpc1768/dhcpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/nsh/Make.defs b/configs/lpcxpresso-lpc1768/nsh/Make.defs
index 21d84b4940..8c6ad9ab85 100644
--- a/configs/lpcxpresso-lpc1768/nsh/Make.defs
+++ b/configs/lpcxpresso-lpc1768/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/nx/Make.defs b/configs/lpcxpresso-lpc1768/nx/Make.defs
index 9a7d190692..a535fd03d0 100644
--- a/configs/lpcxpresso-lpc1768/nx/Make.defs
+++ b/configs/lpcxpresso-lpc1768/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/ostest/Make.defs b/configs/lpcxpresso-lpc1768/ostest/Make.defs
index 1dd92adb73..1b38f2d6b0 100644
--- a/configs/lpcxpresso-lpc1768/ostest/Make.defs
+++ b/configs/lpcxpresso-lpc1768/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/thttpd/Make.defs b/configs/lpcxpresso-lpc1768/thttpd/Make.defs
index fc40cce07d..810d6d7da8 100644
--- a/configs/lpcxpresso-lpc1768/thttpd/Make.defs
+++ b/configs/lpcxpresso-lpc1768/thttpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -137,7 +137,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/lpcxpresso-lpc1768/usbstorage/Make.defs b/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
index d63e11efe1..5342dde5b0 100644
--- a/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
+++ b/configs/lpcxpresso-lpc1768/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/m68332evb/Make.defs b/configs/m68332evb/Make.defs
index fdae944f01..fb85cf8272 100644
--- a/configs/m68332evb/Make.defs
+++ b/configs/m68332evb/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script
 
-CROSSDEV		= m68k-elf-
+CROSSDEV		= m68k-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/m68332evb/doc/m68k-defconfig b/configs/m68332evb/doc/m68k-defconfig
index cbe3c11cd5..60f2e4cbd6 100644
--- a/configs/m68332evb/doc/m68k-defconfig
+++ b/configs/m68332evb/doc/m68k-defconfig
@@ -34,7 +34,7 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 BR2_NUTTX_DIR="$(TOPDIR)/../nuttx"
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_GNU_BUILD_SUFFIX="m68k-elf"
+BR2_GNU_BUILD_SUFFIX="m68k-nuttx-elf"
 BR2_GNU_TARGET_SUFFIX="elf"
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
diff --git a/configs/mbed/hidkbd/Make.defs b/configs/mbed/hidkbd/Make.defs
index f033c685e4..262571e452 100644
--- a/configs/mbed/hidkbd/Make.defs
+++ b/configs/mbed/hidkbd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mbed/nsh/Make.defs b/configs/mbed/nsh/Make.defs
index 468952aa25..40c4c94f31 100644
--- a/configs/mbed/nsh/Make.defs
+++ b/configs/mbed/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mcu123-lpc214x/README.txt b/configs/mcu123-lpc214x/README.txt
index 8236798cc8..b819abf368 100644
--- a/configs/mcu123-lpc214x/README.txt
+++ b/configs/mcu123-lpc214x/README.txt
@@ -42,7 +42,7 @@ GNU Toolchain Options
      make                         # Will build for the NuttX buildroot 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-elf-       # Will build for the NuttX buildroot toolchain
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
diff --git a/configs/mcu123-lpc214x/composite/Make.defs b/configs/mcu123-lpc214x/composite/Make.defs
index 0173a21c6d..f2f0ee8e88 100644
--- a/configs/mcu123-lpc214x/composite/Make.defs
+++ b/configs/mcu123-lpc214x/composite/Make.defs
@@ -40,7 +40,7 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the CodeSourcery 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
 CROSSDEV		= arm-none-eabi-
 CC			= $(CROSSDEV)gcc
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mcu123-lpc214x/nsh/Make.defs b/configs/mcu123-lpc214x/nsh/Make.defs
index daa7a34665..de09916e5f 100644
--- a/configs/mcu123-lpc214x/nsh/Make.defs
+++ b/configs/mcu123-lpc214x/nsh/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mcu123-lpc214x/ostest/Make.defs b/configs/mcu123-lpc214x/ostest/Make.defs
index d807c7bbd2..bc72ca9bdc 100644
--- a/configs/mcu123-lpc214x/ostest/Make.defs
+++ b/configs/mcu123-lpc214x/ostest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mcu123-lpc214x/usbserial/Make.defs b/configs/mcu123-lpc214x/usbserial/Make.defs
index 22edf3bab6..106224ef12 100644
--- a/configs/mcu123-lpc214x/usbserial/Make.defs
+++ b/configs/mcu123-lpc214x/usbserial/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/mcu123-lpc214x/usbstorage/Make.defs b/configs/mcu123-lpc214x/usbstorage/Make.defs
index 732a6733ba..bf1b9cab45 100644
--- a/configs/mcu123-lpc214x/usbstorage/Make.defs
+++ b/configs/mcu123-lpc214x/usbstorage/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/micropendous3/README.txt b/configs/micropendous3/README.txt
index e7b2041aa5..c05f1ddd5b 100644
--- a/configs/micropendous3/README.txt
+++ b/configs/micropendous3/README.txt
@@ -523,7 +523,7 @@ Where <subdir> is one of the following:
 
     FLASH/SRAM Requirements (as of 6/16/2011):
 
-      $ avr-elf-size nuttx
+      $ avr-nuttx-elf-size nuttx
        text    data     bss     dec     hex filename
       24816     978     308   26102    65f6 nuttx
 
diff --git a/configs/micropendous3/hello/Make.defs b/configs/micropendous3/hello/Make.defs
index 058f166905..178f355567 100644
--- a/configs/micropendous3/hello/Make.defs
+++ b/configs/micropendous3/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb647
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/configs/mx1ads/ostest/Make.defs b/configs/mx1ads/ostest/Make.defs
index c80af5c62d..71e053b0aa 100644
--- a/configs/mx1ads/ostest/Make.defs
+++ b/configs/mx1ads/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
diff --git a/configs/ne64badge/ostest/Make.defs b/configs/ne64badge/ostest/Make.defs
index 4dc164d153..9521a0a660 100644
--- a/configs/ne64badge/ostest/Make.defs
+++ b/configs/ne64badge/ostest/Make.defs
@@ -39,7 +39,7 @@ include ${TOPDIR}/tools/Config.mk
 # Setup for the selected toolchain
 # NuttX buildroot under Linux or Cygwin
 
-CROSSDEV = m9s12x-elf-
+CROSSDEV = m9s12x-nuttx-elf-
 MAXOPTIMIZATION = -Os
 WINTOOL = n
 
diff --git a/configs/ntosd-dm320/nettest/Make.defs b/configs/ntosd-dm320/nettest/Make.defs
index b3d49bc731..30d369c2ac 100644
--- a/configs/ntosd-dm320/nettest/Make.defs
+++ b/configs/ntosd-dm320/nettest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/nsh/Make.defs b/configs/ntosd-dm320/nsh/Make.defs
index 6a590a442a..14038f7562 100644
--- a/configs/ntosd-dm320/nsh/Make.defs
+++ b/configs/ntosd-dm320/nsh/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/ostest/Make.defs b/configs/ntosd-dm320/ostest/Make.defs
index dda36c8feb..4618c42467 100644
--- a/configs/ntosd-dm320/ostest/Make.defs
+++ b/configs/ntosd-dm320/ostest/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/poll/Make.defs b/configs/ntosd-dm320/poll/Make.defs
index a3abff2ef2..c06139bd6d 100644
--- a/configs/ntosd-dm320/poll/Make.defs
+++ b/configs/ntosd-dm320/poll/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/thttpd/Make.defs b/configs/ntosd-dm320/thttpd/Make.defs
index 40ecf053f3..075f72eaa2 100644
--- a/configs/ntosd-dm320/thttpd/Make.defs
+++ b/configs/ntosd-dm320/thttpd/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/udp/Make.defs b/configs/ntosd-dm320/udp/Make.defs
index 6122aeb11c..66750f13d6 100644
--- a/configs/ntosd-dm320/udp/Make.defs
+++ b/configs/ntosd-dm320/udp/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/ntosd-dm320/uip/Make.defs b/configs/ntosd-dm320/uip/Make.defs
index 758924a157..d59b96e7c7 100644
--- a/configs/ntosd-dm320/uip/Make.defs
+++ b/configs/ntosd-dm320/uip/Make.defs
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_DM320_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_DM320_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
diff --git a/configs/nucleus2g/nsh/Make.defs b/configs/nucleus2g/nsh/Make.defs
index 65ec1c8f01..3b8f857a6a 100644
--- a/configs/nucleus2g/nsh/Make.defs
+++ b/configs/nucleus2g/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/nucleus2g/ostest/Make.defs b/configs/nucleus2g/ostest/Make.defs
index 413f401787..aa0e6f8648 100644
--- a/configs/nucleus2g/ostest/Make.defs
+++ b/configs/nucleus2g/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/nucleus2g/usbserial/Make.defs b/configs/nucleus2g/usbserial/Make.defs
index 5e473323eb..483fd52609 100644
--- a/configs/nucleus2g/usbserial/Make.defs
+++ b/configs/nucleus2g/usbserial/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/nucleus2g/usbstorage/Make.defs b/configs/nucleus2g/usbstorage/Make.defs
index 35487f85be..7a9c1fa6bc 100644
--- a/configs/nucleus2g/usbstorage/Make.defs
+++ b/configs/nucleus2g/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/README.txt b/configs/olimex-lpc1766stk/README.txt
index aaf40f9ff2..a8bea4d0ef 100644
--- a/configs/olimex-lpc1766stk/README.txt
+++ b/configs/olimex-lpc1766stk/README.txt
@@ -534,7 +534,7 @@ Using OpenOCD and GDB with an FT2232 JTAG emulator
     Once the OpenOCD daemon has been started, you can connect to it via
     GDB using the following GDB command:
 
-      arm-elf-gdb
+      arm-nuttx-elf-gdb
       (gdb) target remote localhost:3333
 
     NOTE:  The name of your GDB program may differ.  For example, with the
diff --git a/configs/olimex-lpc1766stk/ftpc/Make.defs b/configs/olimex-lpc1766stk/ftpc/Make.defs
index 82cf0a2cd6..5671fdffb5 100644
--- a/configs/olimex-lpc1766stk/ftpc/Make.defs
+++ b/configs/olimex-lpc1766stk/ftpc/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/hidkbd/Make.defs b/configs/olimex-lpc1766stk/hidkbd/Make.defs
index dd97168142..1e7160c385 100644
--- a/configs/olimex-lpc1766stk/hidkbd/Make.defs
+++ b/configs/olimex-lpc1766stk/hidkbd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/nettest/Make.defs b/configs/olimex-lpc1766stk/nettest/Make.defs
index 634d97315e..2502cf97b8 100644
--- a/configs/olimex-lpc1766stk/nettest/Make.defs
+++ b/configs/olimex-lpc1766stk/nettest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/nsh/Make.defs b/configs/olimex-lpc1766stk/nsh/Make.defs
index af9750f406..7e62fd7fb2 100644
--- a/configs/olimex-lpc1766stk/nsh/Make.defs
+++ b/configs/olimex-lpc1766stk/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/nx/Make.defs b/configs/olimex-lpc1766stk/nx/Make.defs
index 685d827dad..735e2bd0a2 100644
--- a/configs/olimex-lpc1766stk/nx/Make.defs
+++ b/configs/olimex-lpc1766stk/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/ostest/Make.defs b/configs/olimex-lpc1766stk/ostest/Make.defs
index 84467ae64b..7a9475761a 100644
--- a/configs/olimex-lpc1766stk/ostest/Make.defs
+++ b/configs/olimex-lpc1766stk/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/slip-httpd/Make.defs b/configs/olimex-lpc1766stk/slip-httpd/Make.defs
index 61b7f41e74..35d2c6480f 100644
--- a/configs/olimex-lpc1766stk/slip-httpd/Make.defs
+++ b/configs/olimex-lpc1766stk/slip-httpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/thttpd/Make.defs b/configs/olimex-lpc1766stk/thttpd/Make.defs
index 0e37dbaa32..dbd84c2a6f 100644
--- a/configs/olimex-lpc1766stk/thttpd/Make.defs
+++ b/configs/olimex-lpc1766stk/thttpd/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -123,7 +123,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/usbserial/Make.defs b/configs/olimex-lpc1766stk/usbserial/Make.defs
index 7a56eb6223..07cd41d468 100644
--- a/configs/olimex-lpc1766stk/usbserial/Make.defs
+++ b/configs/olimex-lpc1766stk/usbserial/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/usbstorage/Make.defs b/configs/olimex-lpc1766stk/usbstorage/Make.defs
index 627cdd64e3..76a6927ee3 100644
--- a/configs/olimex-lpc1766stk/usbstorage/Make.defs
+++ b/configs/olimex-lpc1766stk/usbstorage/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc1766stk/wlan/Make.defs b/configs/olimex-lpc1766stk/wlan/Make.defs
index 1087fd8ccf..0cc0d7edd3 100644
--- a/configs/olimex-lpc1766stk/wlan/Make.defs
+++ b/configs/olimex-lpc1766stk/wlan/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_LPC17_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_LPC17_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-lpc2378/nsh/Make.defs b/configs/olimex-lpc2378/nsh/Make.defs
index f81cfb448c..2821aa73c2 100644
--- a/configs/olimex-lpc2378/nsh/Make.defs
+++ b/configs/olimex-lpc2378/nsh/Make.defs
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_OLIMEX_LPC2378_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_OLIMEX_LPC2378_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
@@ -137,7 +137,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG),y)
diff --git a/configs/olimex-lpc2378/ostest/Make.defs b/configs/olimex-lpc2378/ostest/Make.defs
index d13e5eda09..69be8db5b1 100644
--- a/configs/olimex-lpc2378/ostest/Make.defs
+++ b/configs/olimex-lpc2378/ostest/Make.defs
@@ -61,7 +61,7 @@ ifeq ($(CONFIG_OLIMEX_LPC2378_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_OLIMEX_LPC2378_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   MAXOPTIMIZATION = -Os
 endif
 
@@ -137,7 +137,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG),y)
diff --git a/configs/olimex-stm32-p107/nsh/Make.defs b/configs/olimex-stm32-p107/nsh/Make.defs
index a1a30f8791..0108ef1eec 100644
--- a/configs/olimex-stm32-p107/nsh/Make.defs
+++ b/configs/olimex-stm32-p107/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-stm32-p107/ostest/Make.defs b/configs/olimex-stm32-p107/ostest/Make.defs
index 2e8cf87ac5..7cf5e765ff 100644
--- a/configs/olimex-stm32-p107/ostest/Make.defs
+++ b/configs/olimex-stm32-p107/ostest/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-strp711/README.txt b/configs/olimex-strp711/README.txt
index 955887d7b7..74168dbfa9 100644
--- a/configs/olimex-strp711/README.txt
+++ b/configs/olimex-strp711/README.txt
@@ -127,7 +127,7 @@ GNU Toolchain Options
      make                         # Will build for the NuttX buildroot 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-elf-       # Will build for the NuttX buildroot toolchain
+     make CROSSDEV=arm-nuttx-elf- # Will build for the NuttX buildroot toolchain
 
   Of course, hard coding this CROSS_COMPILE value in Make.defs file will save
   some repetitive typing.
@@ -267,7 +267,7 @@ GENERAL STEPS:
 
 6. GDB
 
-  start arm-elf-gdb
+  start arm-nuttx-elf-gdb
   type 'file <executable.elf>' to load the executable
   type 'set debug remote 1' to enable tracing of gdb protocol (if required)
   type 'target remote localhost:3333' to connect to the target
@@ -301,7 +301,7 @@ Windows OpenOCD will Olimex JTAG
   Once the OpenOCD daemon has been started, you can connect to it via
   GDB using the following GDB command:
 
-   arm-elf-gdb
+   arm-nuttx-elf-gdb
    (gdb) target remote localhost:3333
 
   And you can load the NuttX ELF file into FLASH:
diff --git a/configs/olimex-strp711/nettest/Make.defs b/configs/olimex-strp711/nettest/Make.defs
index 9676e54fae..e4b8a9852c 100644
--- a/configs/olimex-strp711/nettest/Make.defs
+++ b/configs/olimex-strp711/nettest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-strp711/nsh/Make.defs b/configs/olimex-strp711/nsh/Make.defs
index ad75862fa1..9ef265d0e1 100644
--- a/configs/olimex-strp711/nsh/Make.defs
+++ b/configs/olimex-strp711/nsh/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/olimex-strp711/ostest/Make.defs b/configs/olimex-strp711/ostest/Make.defs
index 38fc7f5f22..f4bb09d991 100644
--- a/configs/olimex-strp711/ostest/Make.defs
+++ b/configs/olimex-strp711/ostest/Make.defs
@@ -40,9 +40,9 @@ include ${TOPDIR}/tools/Config.mk
 #   make                         -- Will build for the NuttX buildroot 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-elf-       -- Will build for the NuttX buildroot toolchain
+#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
 
-CROSSDEV		= arm-elf-
+CROSSDEV		= arm-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CXX			= $(CROSSDEV)g++
 CPP			= $(CROSSDEV)gcc -E
@@ -63,7 +63,7 @@ OBJCOPYARGS		= -R .note -R .note.gnu.build-id -R .comment
 endif
 endif
 
-ifeq ($(CROSSDEV),arm-elf-)
+ifeq ($(CROSSDEV),arm-nuttx-elf-)
   MKDEP			= $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
@@ -118,7 +118,7 @@ OBJEXT			= .o
 LIBEXT			= .a
 EXEEXT			=
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS		+= -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/qemu-i486/nsh/Make.defs b/configs/qemu-i486/nsh/Make.defs
index c68d3d34e9..8b5fe61f65 100644
--- a/configs/qemu-i486/nsh/Make.defs
+++ b/configs/qemu-i486/nsh/Make.defs
@@ -78,7 +78,7 @@ endif
 # Cygwin toolchains don't generate ELF binaries.
 
 ifeq ($(HOSTOS),Cygwin)
-CROSSDEV = i486-elf-
+CROSSDEV = i486-nuttx-elf-
 else
 CROSSDEV =
 endif
diff --git a/configs/qemu-i486/ostest/Make.defs b/configs/qemu-i486/ostest/Make.defs
index fa7dc7bf84..0a2423456e 100644
--- a/configs/qemu-i486/ostest/Make.defs
+++ b/configs/qemu-i486/ostest/Make.defs
@@ -78,7 +78,7 @@ endif
 # Cygwin toolchains don't generate ELF binaries.
 
 ifeq ($(HOSTOS),Cygwin)
-CROSSDEV = i486-elf-
+CROSSDEV = i486-nuttx-elf-
 else
 CROSSDEV =
 endif
diff --git a/configs/sam3u-ek/knsh/Make.defs b/configs/sam3u-ek/knsh/Make.defs
index cce80669a8..bbe8b23c06 100644
--- a/configs/sam3u-ek/knsh/Make.defs
+++ b/configs/sam3u-ek/knsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/sam3u-ek/nsh/Make.defs b/configs/sam3u-ek/nsh/Make.defs
index e4f24326d3..0f236114f0 100644
--- a/configs/sam3u-ek/nsh/Make.defs
+++ b/configs/sam3u-ek/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/sam3u-ek/nx/Make.defs b/configs/sam3u-ek/nx/Make.defs
index e98aaf9d69..10cabe5a56 100644
--- a/configs/sam3u-ek/nx/Make.defs
+++ b/configs/sam3u-ek/nx/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/sam3u-ek/ostest/Make.defs b/configs/sam3u-ek/ostest/Make.defs
index 7d38aedb2c..7689fb2a18 100644
--- a/configs/sam3u-ek/ostest/Make.defs
+++ b/configs/sam3u-ek/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/sam3u-ek/touchscreen/Make.defs b/configs/sam3u-ek/touchscreen/Make.defs
index 1dccbc6bc2..2047daf684 100644
--- a/configs/sam3u-ek/touchscreen/Make.defs
+++ b/configs/sam3u-ek/touchscreen/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_SAM3U_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_SAM3U_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/shenzhou/nsh/Make.defs b/configs/shenzhou/nsh/Make.defs
index 847866420a..95495d4c43 100644
--- a/configs/shenzhou/nsh/Make.defs
+++ b/configs/shenzhou/nsh/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/shenzhou/nxwm/Make.defs b/configs/shenzhou/nxwm/Make.defs
index 0025282b44..96e0ffd4b2 100644
--- a/configs/shenzhou/nxwm/Make.defs
+++ b/configs/shenzhou/nxwm/Make.defs
@@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -153,7 +153,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/skp16c26/README.txt b/configs/skp16c26/README.txt
index dc94bbf8d4..31332b59b6 100644
--- a/configs/skp16c26/README.txt
+++ b/configs/skp16c26/README.txt
@@ -1,112 +1,112 @@
-configs/skp16c26/README.txt
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-1. The buildroot package can be used to build an M16C toolchain.  The toolchain
-   buildroot can be downloaded from misc/buildroot in the NuttX SVN.  Insructions
-   for building the toolchain are provided below.
-
-   However, the target cannot be built because the GNU m16c-elf-ld link fails with 
-   the following message:
-
-     m32c-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482
-
-   Where the reference line is:
-
-     /* If the symbol is out of range for a 16-bit address,
-        we must have allocated a plt entry.  */
-     BFD_ASSERT (*plt_offset != (bfd_vma) -1);
-
-   No workaround is known at this time.  This is a show stopper for M16C.
-
-2. A supported version of the M16C toolchain is available here: 
-
-     http://www.kpitgnutools.com/index.php
-
-   This download is free but requires registration.  Unfortunately, this v0901 of
-   this toolchain shows the same behavior:
-
-   c:\Hew3\Tools\KPIT Cummins\GNUM16CM32C-ELF\v0901\m32c-elf\bin\m32c-elf-ld.exe: BFD (GNU Binutils) 2.19-GNUM16CM32C_v0901 assertion fail /home/kpit/fsfsrc/binutils-2.19/bfd/elf32-m32c.c:482
-
-It is possible that this error messasge my be telling me -- a very roundabout way --
-that I have exceeded the FLASH region, but I think that unlikely (it is difficult
-to know if the link does not complete gracefully).
-
-BUILDING THE R8C/M16C/M32C GNU TOOLCHAIN USING BUILDROOT
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-NOTE:  See the toolchain issues above -- you may not want to waste your time.
-
-1. CD to the correct directory.
-
-   Change to the directory just above the NuttX installation.  If <nuttx-dir> is
-   where NuttX is installed, then cd to <nuttx-dir>/..
-
-2. Get and Install the buildroot Module
-
-   a. Using a release tarball:
-
-     cd <nuttx-dir>/..
-     Download the appropriate buildroot package.
-     unpack the buildroot package
-     rename the directory to buildroot
-
-   b. Using SVN
-   
-     Check out the misc/buildroot module. SVN checkout instructions:
-
-        svn checkout svn://svn.code.sf.net/p/nuttx/code/trunk/buildroot buildroot
-
-   Make the archive directory:
-  
-     mkdir archive
-
-   The <nuttx-dir>/../buildroot is where the toolchain is built;
-   The <nuttx-dir>/../archive directory is where toolchain sources will be downloaded.
-
-3. Make sure that NuttX is configured
-
-     cd <nuttx-dir>/tools
-     ./configure.sh <nuttx-configuration>
-     
-4. Configure and Make the buildroot
-
-     cd buildroot
-     cp configs/m32c-defconfig-4.2.4 .config
-     make oldconfig
-     make
-
-   This will download the large source packages for the toolchain and build the toolchain.
-   The resulting binaries will be under buildroot/build_m32c.  There will also be a
-   large build directory called toolchain_build_m32c; this directory can be removed once
-   the build completes successfully.
-
-Cygwin GCC BUILD NOTES
-^^^^^^^^^^^^^^^^^^^^^^
-   On Cygwin, the buildroot 'make' command will fail with an error like:
-
-   "...
-      build/genchecksum cc1-dummy > cc1-checksum.c
-      opening cc1-dummy: No such file or directory
-   ..."
-
-   This is caused because on Cygwin, host executables will be generated with the extension .exe
-   and, apparently, the make variable "exeext" is set incorrectly.  A work around after the
-   above occurs is:
-
-      cd toolchain_build_m32c/gcc-4.2.4-initial/gcc	# Go to the directory where error occurred
-      mv cc1-dummy.exe cc1-dummy			# Rename the executable without .exe
-      rm cc1-checksum.c					# Get rid of the bad generated file
-
-   Then resume the buildroot make:
-
-      cd -						# Back to the buildroot make directory
-      make						# Restart the build
-
-   GCC is built twice.  First a initial, "bootstap" GCC is produced in
-   toolchain_build_m32c/gcc-4.2.4-initial, then the final GCC is produced in
-   toolchain_build_m32c/gcc-4.2.4-final.  The above error will occur twice:  Once for
-   the intial GCC build (see above) and once for the final GCC build. For the final GCC
-   build, the workaround is the same except that the directory will be
-   toolchain_build_m32c/gcc-4.2.4-final/gcc.
-
-   
\ No newline at end of file
+configs/skp16c26/README.txt
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+1. The buildroot package can be used to build an M16C toolchain.  The toolchain
+   buildroot can be downloaded from misc/buildroot in the NuttX SVN.  Insructions
+   for building the toolchain are provided below.
+
+   However, the target cannot be built because the GNU m16c-nuttx-elf-ld link fails with 
+   the following message:
+
+     m32c-nuttx-elf-ld: BFD (GNU Binutils) 2.19 assertion fail /home/Owner/projects/nuttx/buildroot/toolchain_build_m32c/binutils-2.19/bfd/elf32-m32c.c:482
+
+   Where the reference line is:
+
+     /* If the symbol is out of range for a 16-bit address,
+        we must have allocated a plt entry.  */
+     BFD_ASSERT (*plt_offset != (bfd_vma) -1);
+
+   No workaround is known at this time.  This is a show stopper for M16C.
+
+2. A supported version of the M16C toolchain is available here: 
+
+     http://www.kpitgnutools.com/index.php
+
+   This download is free but requires registration.  Unfortunately, this v0901 of
+   this toolchain shows the same behavior:
+
+   c:\Hew3\Tools\KPIT Cummins\GNUM16CM32C-ELF\v0901\m32c-elf\bin\m32c-elf-ld.exe: BFD (GNU Binutils) 2.19-GNUM16CM32C_v0901 assertion fail /home/kpit/fsfsrc/binutils-2.19/bfd/elf32-m32c.c:482
+
+It is possible that this error messasge my be telling me -- a very roundabout way --
+that I have exceeded the FLASH region, but I think that unlikely (it is difficult
+to know if the link does not complete gracefully).
+
+BUILDING THE R8C/M16C/M32C GNU TOOLCHAIN USING BUILDROOT
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+NOTE:  See the toolchain issues above -- you may not want to waste your time.
+
+1. CD to the correct directory.
+
+   Change to the directory just above the NuttX installation.  If <nuttx-dir> is
+   where NuttX is installed, then cd to <nuttx-dir>/..
+
+2. Get and Install the buildroot Module
+
+   a. Using a release tarball:
+
+     cd <nuttx-dir>/..
+     Download the appropriate buildroot package.
+     unpack the buildroot package
+     rename the directory to buildroot
+
+   b. Using SVN
+   
+     Check out the misc/buildroot module. SVN checkout instructions:
+
+        svn checkout svn://svn.code.sf.net/p/nuttx/code/trunk/buildroot buildroot
+
+   Make the archive directory:
+  
+     mkdir archive
+
+   The <nuttx-dir>/../buildroot is where the toolchain is built;
+   The <nuttx-dir>/../archive directory is where toolchain sources will be downloaded.
+
+3. Make sure that NuttX is configured
+
+     cd <nuttx-dir>/tools
+     ./configure.sh <nuttx-configuration>
+     
+4. Configure and Make the buildroot
+
+     cd buildroot
+     cp configs/m32c-defconfig-4.2.4 .config
+     make oldconfig
+     make
+
+   This will download the large source packages for the toolchain and build the toolchain.
+   The resulting binaries will be under buildroot/build_m32c.  There will also be a
+   large build directory called toolchain_build_m32c; this directory can be removed once
+   the build completes successfully.
+
+Cygwin GCC BUILD NOTES
+^^^^^^^^^^^^^^^^^^^^^^
+   On Cygwin, the buildroot 'make' command will fail with an error like:
+
+   "...
+      build/genchecksum cc1-dummy > cc1-checksum.c
+      opening cc1-dummy: No such file or directory
+   ..."
+
+   This is caused because on Cygwin, host executables will be generated with the extension .exe
+   and, apparently, the make variable "exeext" is set incorrectly.  A work around after the
+   above occurs is:
+
+      cd toolchain_build_m32c/gcc-4.2.4-initial/gcc	# Go to the directory where error occurred
+      mv cc1-dummy.exe cc1-dummy			# Rename the executable without .exe
+      rm cc1-checksum.c					# Get rid of the bad generated file
+
+   Then resume the buildroot make:
+
+      cd -						# Back to the buildroot make directory
+      make						# Restart the build
+
+   GCC is built twice.  First a initial, "bootstap" GCC is produced in
+   toolchain_build_m32c/gcc-4.2.4-initial, then the final GCC is produced in
+   toolchain_build_m32c/gcc-4.2.4-final.  The above error will occur twice:  Once for
+   the intial GCC build (see above) and once for the final GCC build. For the final GCC
+   build, the workaround is the same except that the directory will be
+   toolchain_build_m32c/gcc-4.2.4-final/gcc.
+
+   
diff --git a/configs/skp16c26/ostest/Make.defs b/configs/skp16c26/ostest/Make.defs
index 79f0140133..a7444daae3 100644
--- a/configs/skp16c26/ostest/Make.defs
+++ b/configs/skp16c26/ostest/Make.defs
@@ -36,7 +36,7 @@
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
 
-CROSSDEV		= m32c-elf-
+CROSSDEV		= m32c-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/stm3210e-eval/RIDE/Make.defs b/configs/stm3210e-eval/RIDE/Make.defs
index f24075038d..dfd0f600b7 100644
--- a/configs/stm3210e-eval/RIDE/Make.defs
+++ b/configs/stm3210e-eval/RIDE/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/buttons/Make.defs b/configs/stm3210e-eval/buttons/Make.defs
index ed7d6e7f00..9f0691bba8 100644
--- a/configs/stm3210e-eval/buttons/Make.defs
+++ b/configs/stm3210e-eval/buttons/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/composite/Make.defs b/configs/stm3210e-eval/composite/Make.defs
index e084664298..9b855671f3 100644
--- a/configs/stm3210e-eval/composite/Make.defs
+++ b/configs/stm3210e-eval/composite/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nsh/Make.defs b/configs/stm3210e-eval/nsh/Make.defs
index 1e8e945b64..afdf0c0971 100644
--- a/configs/stm3210e-eval/nsh/Make.defs
+++ b/configs/stm3210e-eval/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nsh2/Make.defs b/configs/stm3210e-eval/nsh2/Make.defs
index 049c9d7a80..7d36c9a00d 100644
--- a/configs/stm3210e-eval/nsh2/Make.defs
+++ b/configs/stm3210e-eval/nsh2/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nx/Make.defs b/configs/stm3210e-eval/nx/Make.defs
index a553e01630..bb0ba5b6df 100644
--- a/configs/stm3210e-eval/nx/Make.defs
+++ b/configs/stm3210e-eval/nx/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nxconsole/Make.defs b/configs/stm3210e-eval/nxconsole/Make.defs
index d55f4c61d4..84b36b2676 100644
--- a/configs/stm3210e-eval/nxconsole/Make.defs
+++ b/configs/stm3210e-eval/nxconsole/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nxlines/Make.defs b/configs/stm3210e-eval/nxlines/Make.defs
index 83bd9eb5e8..a896a901e6 100644
--- a/configs/stm3210e-eval/nxlines/Make.defs
+++ b/configs/stm3210e-eval/nxlines/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/nxtext/Make.defs b/configs/stm3210e-eval/nxtext/Make.defs
index 4a082fc745..00370c3b0f 100644
--- a/configs/stm3210e-eval/nxtext/Make.defs
+++ b/configs/stm3210e-eval/nxtext/Make.defs
@@ -73,7 +73,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -134,7 +134,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/ostest/Make.defs b/configs/stm3210e-eval/ostest/Make.defs
index 41a1974570..09b3f03954 100644
--- a/configs/stm3210e-eval/ostest/Make.defs
+++ b/configs/stm3210e-eval/ostest/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/pm/Make.defs b/configs/stm3210e-eval/pm/Make.defs
index c298c4364b..0cc96fa4ee 100644
--- a/configs/stm3210e-eval/pm/Make.defs
+++ b/configs/stm3210e-eval/pm/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/usbserial/Make.defs b/configs/stm3210e-eval/usbserial/Make.defs
index f45de369e9..cda6edf4ee 100644
--- a/configs/stm3210e-eval/usbserial/Make.defs
+++ b/configs/stm3210e-eval/usbserial/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3210e-eval/usbstorage/Make.defs b/configs/stm3210e-eval/usbstorage/Make.defs
index e0a4de6f9e..36688bc805 100644
--- a/configs/stm3210e-eval/usbstorage/Make.defs
+++ b/configs/stm3210e-eval/usbstorage/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/dhcpd/Make.defs b/configs/stm3220g-eval/dhcpd/Make.defs
index 4a94997a5c..f75e94501f 100644
--- a/configs/stm3220g-eval/dhcpd/Make.defs
+++ b/configs/stm3220g-eval/dhcpd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/nettest/Make.defs b/configs/stm3220g-eval/nettest/Make.defs
index c69852119f..f307d9475d 100644
--- a/configs/stm3220g-eval/nettest/Make.defs
+++ b/configs/stm3220g-eval/nettest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/nsh/Make.defs b/configs/stm3220g-eval/nsh/Make.defs
index 4b2bbef30a..9fe8b0ffab 100644
--- a/configs/stm3220g-eval/nsh/Make.defs
+++ b/configs/stm3220g-eval/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/nsh2/Make.defs b/configs/stm3220g-eval/nsh2/Make.defs
index d813508680..64f158ecb5 100644
--- a/configs/stm3220g-eval/nsh2/Make.defs
+++ b/configs/stm3220g-eval/nsh2/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/nxwm/Make.defs b/configs/stm3220g-eval/nxwm/Make.defs
index 616529e7e2..37280e0c44 100644
--- a/configs/stm3220g-eval/nxwm/Make.defs
+++ b/configs/stm3220g-eval/nxwm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/ostest/Make.defs b/configs/stm3220g-eval/ostest/Make.defs
index 9d8c07dfa2..41e8fff142 100644
--- a/configs/stm3220g-eval/ostest/Make.defs
+++ b/configs/stm3220g-eval/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3220g-eval/telnetd/Make.defs b/configs/stm3220g-eval/telnetd/Make.defs
index 10725d7279..416bfaa47b 100644
--- a/configs/stm3220g-eval/telnetd/Make.defs
+++ b/configs/stm3220g-eval/telnetd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/dhcpd/Make.defs b/configs/stm3240g-eval/dhcpd/Make.defs
index 7fb1e0b7f8..1c7a7cff0e 100644
--- a/configs/stm3240g-eval/dhcpd/Make.defs
+++ b/configs/stm3240g-eval/dhcpd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/discover/Make.defs b/configs/stm3240g-eval/discover/Make.defs
index abcae0f5f0..9cf9d59585 100644
--- a/configs/stm3240g-eval/discover/Make.defs
+++ b/configs/stm3240g-eval/discover/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/nettest/Make.defs b/configs/stm3240g-eval/nettest/Make.defs
index a0a1cd58fd..e8af4cbb5d 100644
--- a/configs/stm3240g-eval/nettest/Make.defs
+++ b/configs/stm3240g-eval/nettest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/nsh/Make.defs b/configs/stm3240g-eval/nsh/Make.defs
index ab0ede05e6..e88f1054b4 100644
--- a/configs/stm3240g-eval/nsh/Make.defs
+++ b/configs/stm3240g-eval/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/nsh2/Make.defs b/configs/stm3240g-eval/nsh2/Make.defs
index 7a0e19582f..3e7fa8bd2a 100644
--- a/configs/stm3240g-eval/nsh2/Make.defs
+++ b/configs/stm3240g-eval/nsh2/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/nxconsole/Make.defs b/configs/stm3240g-eval/nxconsole/Make.defs
index 6c200d3ce0..aedfacc80a 100644
--- a/configs/stm3240g-eval/nxconsole/Make.defs
+++ b/configs/stm3240g-eval/nxconsole/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/nxwm/Make.defs b/configs/stm3240g-eval/nxwm/Make.defs
index 167792094f..631cfab861 100644
--- a/configs/stm3240g-eval/nxwm/Make.defs
+++ b/configs/stm3240g-eval/nxwm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/ostest/Make.defs b/configs/stm3240g-eval/ostest/Make.defs
index a7e7a1392d..875d39f22d 100644
--- a/configs/stm3240g-eval/ostest/Make.defs
+++ b/configs/stm3240g-eval/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/telnetd/Make.defs b/configs/stm3240g-eval/telnetd/Make.defs
index 1ddbddaabd..d0ed37f28d 100644
--- a/configs/stm3240g-eval/telnetd/Make.defs
+++ b/configs/stm3240g-eval/telnetd/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/webserver/Make.defs b/configs/stm3240g-eval/webserver/Make.defs
index 0669350803..fbe1ffb0ec 100644
--- a/configs/stm3240g-eval/webserver/Make.defs
+++ b/configs/stm3240g-eval/webserver/Make.defs
@@ -89,8 +89,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -154,7 +154,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm3240g-eval/xmlrpc/Make.defs b/configs/stm3240g-eval/xmlrpc/Make.defs
index eb02622e66..61b0d5c4e4 100644
--- a/configs/stm3240g-eval/xmlrpc/Make.defs
+++ b/configs/stm3240g-eval/xmlrpc/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm32f4discovery/nsh/Make.defs b/configs/stm32f4discovery/nsh/Make.defs
index 4a776bffe5..f4110cce3e 100644
--- a/configs/stm32f4discovery/nsh/Make.defs
+++ b/configs/stm32f4discovery/nsh/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm32f4discovery/nxlines/Make.defs b/configs/stm32f4discovery/nxlines/Make.defs
index c728da7b3c..8dab2009ce 100644
--- a/configs/stm32f4discovery/nxlines/Make.defs
+++ b/configs/stm32f4discovery/nxlines/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm32f4discovery/ostest/Make.defs b/configs/stm32f4discovery/ostest/Make.defs
index 7ee4375893..f20fddb843 100644
--- a/configs/stm32f4discovery/ostest/Make.defs
+++ b/configs/stm32f4discovery/ostest/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/stm32f4discovery/pm/Make.defs b/configs/stm32f4discovery/pm/Make.defs
index 8dc63684e2..f96f439ee4 100644
--- a/configs/stm32f4discovery/pm/Make.defs
+++ b/configs/stm32f4discovery/pm/Make.defs
@@ -90,8 +90,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
-  ARCROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
+  ARCROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -155,7 +155,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/teensy/hello/Make.defs b/configs/teensy/hello/Make.defs
index 72d51de14b..cca88363cd 100644
--- a/configs/teensy/hello/Make.defs
+++ b/configs/teensy/hello/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/configs/teensy/nsh/Make.defs b/configs/teensy/nsh/Make.defs
index e58b1596ec..13f8e79027 100644
--- a/configs/teensy/nsh/Make.defs
+++ b/configs/teensy/nsh/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/configs/teensy/usbstorage/Make.defs b/configs/teensy/usbstorage/Make.defs
index b221491d64..706daf81f6 100644
--- a/configs/teensy/usbstorage/Make.defs
+++ b/configs/teensy/usbstorage/Make.defs
@@ -57,7 +57,7 @@ endif
 
 ifeq ($(CONFIG_AVR_BUILDROOT),y)
   # NuttX buildroot GCC toolchain under Linux or Cygwin
-  CROSSDEV = avr-elf-
+  CROSSDEV = avr-nuttx-elf-
   MAXOPTIMIZATION = -O2
   ARCHCPUFLAGS = -mmcu=at90usb1286
   LDFLAGS += -nostartfiles -nodefaultlibs
diff --git a/configs/twr-k60n512/nsh/Make.defs b/configs/twr-k60n512/nsh/Make.defs
index ebeea90a54..99041bcc29 100644
--- a/configs/twr-k60n512/nsh/Make.defs
+++ b/configs/twr-k60n512/nsh/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/twr-k60n512/ostest/Make.defs b/configs/twr-k60n512/ostest/Make.defs
index 2f5e208fe5..93c887a2d6 100644
--- a/configs/twr-k60n512/ostest/Make.defs
+++ b/configs/twr-k60n512/ostest/Make.defs
@@ -58,7 +58,7 @@ ifeq ($(CONFIG_KINETIS_DEVKITARM),y)
 endif
 ifeq ($(CONFIG_KINETIS_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft -mlong-calls
   MAXOPTIMIZATION = -Os
 endif
@@ -120,7 +120,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
diff --git a/configs/us7032evb1/nsh/Make.defs b/configs/us7032evb1/nsh/Make.defs
index d861f5d48d..9cbc41f5b9 100644
--- a/configs/us7032evb1/nsh/Make.defs
+++ b/configs/us7032evb1/nsh/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
 
-CROSSDEV		= sh-elf-
+CROSSDEV		= sh-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/us7032evb1/ostest/Make.defs b/configs/us7032evb1/ostest/Make.defs
index 580c126286..32f45eddab 100644
--- a/configs/us7032evb1/ostest/Make.defs
+++ b/configs/us7032evb1/ostest/Make.defs
@@ -50,7 +50,7 @@ ARCHDEFINES		=
 ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
 ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
 
-CROSSDEV		= sh-elf-
+CROSSDEV		= sh-nuttx-elf-
 CC			= $(CROSSDEV)gcc
 CPP			= $(CROSSDEV)gcc -E
 LD			= $(CROSSDEV)ld
diff --git a/configs/vsn/nsh/Make.defs b/configs/vsn/nsh/Make.defs
index 15de85f605..abcdf49c16 100644
--- a/configs/vsn/nsh/Make.defs
+++ b/configs/vsn/nsh/Make.defs
@@ -70,7 +70,7 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y)
 endif
 ifeq ($(CONFIG_STM32_BUILDROOT),y)
   # NuttX buildroot under Linux or Cygwin
-  CROSSDEV = arm-elf-
+  CROSSDEV = arm-nuttx-elf-
   ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
   MAXOPTIMIZATION = -Os
 endif
@@ -132,7 +132,7 @@ OBJEXT = .o
 LIBEXT = .a
 EXEEXT =
 
-ifneq ($(CROSSDEV),arm-elf-)
+ifneq ($(CROSSDEV),arm-nuttx-elf-)
   LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)