Index: BOOK/cross-tools/arm-chapter.xml
===================================================================
--- BOOK/cross-tools/arm-chapter.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/arm-chapter.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/uclibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/uclibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-final.xml"/>
 
Index: BOOK/cross-tools/arm/abi.xml
===================================================================
--- BOOK/cross-tools/arm/abi.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/arm/abi.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -58,5 +58,5 @@
           <entry>apcs-gnu</entry>
           <entry>apcs-gnu</entry>
-          <entry>Legacy ABI, arm4 and older</entry>
+          <entry>OABI</entry>
         </row>
         <row>
Index: BOOK/cross-tools/arm/gcc-final.xml
===================================================================
--- BOOK/cross-tools/arm/gcc-final.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/arm/gcc-final.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -43,31 +43,12 @@
   --enable-languages=c --enable-c99 --enable-long-long \
   --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --with-abi=${CLFS_ABI}</userinput></screen>
+  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --with-abi=${CLFS_ABI} --with-arch=${CLFS_ARM_ARCH} \
+  --with-mode=${CLFS_ARM_MODE} --with-float=${CLFS_FLOAT} \
+  --with-fpu=${CLFS_FPU}</userinput></screen>
 
-    <variablelist os="af">
-      <title>The meaning of the configure options not used previously:</title>
-
-      <varlistentry os="af1">
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Enables the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af2">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af3">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/arm/gcc-static.xml
===================================================================
--- BOOK/cross-tools/arm/gcc-static.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/arm/gcc-static.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -48,5 +48,7 @@
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
   --disable-libssp --disable-threads --enable-languages=c \
-  --with-abi=${CLFS_ABI}</userinput></screen>
+  --disable-multilib --with-abi=${CLFS_ABI} --with-arch=${CLFS_ARM_ARCH} \
+  --with-mode=${CLFS_ARM_MODE} --with-float=${CLFS_FLOAT} \
+  --with-fpu=${CLFS_FPU}</userinput></screen>
 
 <!-- Common configure switches for all archs -->
@@ -62,4 +64,29 @@
       <listitem>
         <para>This option sets the ABI selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag2">
+      <term><parameter>--with-arch=${CLFS_ARM_ARCH}</parameter></term>
+      <listitem>
+        <para>This option sets the ARM architecture selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag3">
+      <term><parameter>--with-mode=${CLFS_ARM_MODE}</parameter></term>
+      <listitem>
+        <para>This option sets the ARM mode (arm or thumb) selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag4">
+      <term><parameter>--with-float=${CLFS_FLOAT}</parameter></term>
+      <listitem>
+        <para>This option sets the floating point mode selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag5">
+      <term><parameter>--with-fpu=${CLFS_FPU}</parameter></term>
+      <listitem>
+        <para>This option sets the hardware floating point type selected 
+        earlier.  If soft floating point was selected, this value is ignored.</para>
       </listitem>
     </varlistentry>
Index: BOOK/cross-tools/arm/uclibc.xml
===================================================================
--- BOOK/cross-tools/arm/uclibc.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
+++ BOOK/cross-tools/arm/uclibc.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<!-- ARM specific uClibc -->
+
+<sect1 id="ch-cross-tools-uclibc" role="wrap">
+  <?dbhtml filename="uclibc.html"?>
+
+  <title>uClibc-&uclibc-version;</title>
+
+  <indexterm zone="ch-cross-tools-uclibc">
+    <primary sortas="a-uClibc">uClibc</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/uclibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of uClibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+
+   <para os="d">For the ARM architecture, there are two different configurations
+   of uClibc that can be used: the EABI configuration and the OABI configuration.
+   We will first copy the OABI configuration and, if the EABI was selected, modify
+   it to use the EABI:</para>
+
+<screen os="e"><userinput>cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config
+if [ "${CLFS_ABI}" == "aapcs" ] || [ "${CLFS_ABI}" == "aapcs-linux" ]; \
+then sed -i s/CONFIG_ARM_OABI/CONFIG_ARM_EABI/g .config; fi</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/uclibc.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
+
+</sect1>
Index: BOOK/cross-tools/arm/variables.xml
===================================================================
--- BOOK/cross-tools/arm/variables.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/arm/variables.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -13,10 +13,13 @@
   <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
 
-  <para os="a">During the building of the cross-compile tools you will need to
+  <para os="a">During the building of the cross-compile tools, you will need to
   set a few variables that will be dependent on your particular needs.
-  You will need to set the target triplet for the target architecture and CPU
-  endianess. If you do not know what triplet or endianess you want,
-  you can use the table at the bottom of this page as a reference. Set
-  the command using the method listed below:</para>
+  You will need to select the target triplet for the target architecture, the CPU
+  endianess, the CPU architecture, the CPU mode, the CPU floating point hardware
+  availability, and (if available) the type of floating point hardware. If you 
+  do not know what values can be chosen for each of these, you can use the 
+  tables at the bottom of this page as a reference.</para>
+
+  <para os="a1">First, set the host and target triplets:</para>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -29,5 +32,24 @@
 
 <screen os="d"><userinput>export CLFS_ARCH=arm
-export CLFS_ENDIAN=<replaceable>[endianess]</replaceable></userinput></screen>
+export CLFS_ENDIAN="<replaceable>[endianess]</replaceable>"</userinput></screen>
+
+  <para os="e">Choose the ARM architecture (see table below) and mode of 
+  your CPU:</para>
+
+<screen os="f"><userinput>export CLFS_ARM_ARCH="<replaceable>[architecture]</replaceable>"
+export CLFS_ARM_MODE="<replaceable>[arm or thumb]</replaceable>"</userinput></screen>
+
+  <para os="f1">If your target CPU has hard floating point support (not all ARM
+  CPUs do), set the following CLFS_FLOAT variable to either "hard" or "softfp".
+  If your target CPU does not have hard floating point support, set the following
+  CLFS_FLOAT vairable to "soft".</para>
+
+<screen os="f2"><userinput>export CLFS_FLOAT="<replaceable>[hard, softfp, or soft]"</replaceable></userinput></screen>
+
+  <para os="f3">If you chose either "hard" or "softfp" for CLFS_FLOAT, you now
+  need to set which floating point hardware is actually included (see table below)
+  with your ARM CPU:</para>
+
+<screen os="f4"><userinput>export CLFS_FPU="<replaceable>[fpu version]</replaceable>"</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -35,10 +57,15 @@
   xpointer="xpointer(//*[@os='g'])"/>
 
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/variables.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
+<screen os="h"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_ARCH=\""${CLFS_ARCH}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_ENDIAN=\""${CLFS_ENDIAN}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_ARM_ARCH=\""${CLFS_ARM_ARCH}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_ARM_MODE=\""${CLFS_ARM_MODE}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_FLOAT=\""${CLFS_FLOAT}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_FPU=\""${CLFS_FPU}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
   <table os="i">
-    <title>Processor Type, ABI, and  Target Triplets</title>
+    <title>Example Processor Type, ABI, and  Target Triplets</title>
     <?dbfo table-width="7in" ?>
 
@@ -46,5 +73,5 @@
 
       <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
-      <colspec colnum="2" colwidth="1in" colname="Endian"/>
+      <colspec colnum="2" colwidth="1in" colname="Endianess"/>
       <colspec colnum="3" colwidth="1in" colname="ABI"/>
       <colspec colnum="4" colwidth="2.5in" colname="Triplet"/>
@@ -53,5 +80,5 @@
         <row>
           <entry>Processor</entry>
-          <entry>Endian</entry>
+          <entry>Endianess</entry>
           <entry>ABI</entry>
           <entry>Target Triplet</entry>
@@ -76,5 +103,5 @@
           <entry>little</entry>
           <entry>EABI</entry>
-          <entry>armv5l-unknown-linux-uclibcgnueabi</entry>
+          <entry>armv5l-unknown-linux-uclibceabi</entry>
         </row>
         <row>
@@ -82,5 +109,5 @@
           <entry>big</entry>
           <entry>EABI</entry>
-          <entry>armv5b-unknown-linux-uclibcgnueabi</entry>
+          <entry>armv5b-unknown-linux-uclibceabi</entry>
         </row>
         <row>
@@ -88,5 +115,5 @@
           <entry>little</entry>
           <entry>EABI</entry>
-          <entry>arm-unknown-linux-uclibcgnueabi</entry>
+          <entry>arm-unknown-linux-uclibceabi</entry>
         </row>
         <row>
@@ -94,5 +121,5 @@
           <entry>little</entry>
           <entry>EABI</entry>
-          <entry>armv7a-unknown-linux-uclibcgnueabi</entry>
+          <entry>armv7a-unknown-linux-uclibceabi</entry>
         </row>
       </tbody>
@@ -102,3 +129,96 @@
   </table>
 
+  <table os="j">
+    <title>ARM Archiecture Choices</title>
+    <?dbfo table-width="4in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="1in" colname="Arch Choice"/>
+      <colspec colnum="2" colwidth="1in" colname="Arch Choice"/>
+      <colspec colnum="3" colwidth="1in" colname="Arch Choice"/>
+      <colspec colnum="4" colwidth="1in" colname="Arch Choice"/>
+
+      <tbody>
+        <row>
+          <entry>armv2</entry>
+          <entry>armv2a</entry>
+          <entry>armv3</entry>
+          <entry>armv3m</entry>
+        </row>
+        <row>
+          <entry>armv4</entry>
+          <entry>armv4t</entry>
+          <entry>armv5</entry>
+          <entry>armv5t</entry>
+        </row>
+        <row>
+          <entry>armv5te</entry>
+          <entry>armv6</entry>
+          <entry>armv6j</entry>
+          <entry>armv6t2</entry>
+        </row>
+        <row>
+          <entry>armv6z</entry>
+          <entry>armv6zk</entry>
+          <entry>armv6-m</entry>
+          <entry>armv7</entry>
+        </row>
+        <row>
+          <entry>armv7-a</entry>
+          <entry>armv7-r</entry>
+          <entry>armv7-m</entry>
+          <entry>iwmmxt</entry>
+        </row>
+        <row>
+          <entry>iwmmxt2</entry>
+          <entry>ep9312</entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </table>
+
+  <table os="j">
+    <title>ARM Hard Floating Point Versions</title>
+    <?dbfo table-width="4in" ?>
+
+    <tgroup cols="2">
+
+      <colspec colnum="1" colwidth="1in" colname="FPU Choice"/>
+      <colspec colnum="2" colwidth="1in" colname="FPU Choice"/>
+      <colspec colnum="3" colwidth="1in" colname="FPU Choice"/>
+      <colspec colnum="4" colwidth="1in" colname="FPU Choice"/>
+
+      <tbody>
+        <row>
+          <entry>fpa</entry>
+          <entry>fpe2</entry>
+          <entry>fpe3</entry>
+          <entry>maverick</entry>
+        </row>
+        <row>
+          <entry>vfp</entry>
+          <entry>vfpv3</entry>
+          <entry>vfpv3-fp16</entry>
+          <entry>vfpv3-d16</entry>
+        </row>
+        <row>
+          <entry>vfpv3-d16-fp16</entry>
+          <entry>vfpv3xd</entry>
+          <entry>vfpv3xd-fp16</entry>
+          <entry>neon</entry>
+        </row>
+        <row>
+          <entry>neon-fp16</entry>
+          <entry>vfpv4</entry>
+          <entry>vfpv4-d16</entry>
+          <entry>fpv4-sp-d16</entry>
+        </row>
+        <row>
+          <entry>neon-vfpv4</entry>
+        </row>
+      </tbody>
+    </tgroup>
+  </table>
+
 </sect1>
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -45,5 +45,5 @@
   --enable-languages=c --enable-c99 --enable-long-long \
   --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools</userinput></screen>
+  --with-mpc=${CLFS}/cross-tools --disable-multilib</userinput></screen>
 
     <variablelist os="af">
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -47,5 +47,6 @@
   --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
-  --disable-libssp --disable-threads --enable-languages=c</userinput></screen>
+  --disable-libssp --disable-threads --enable-languages=c \
+  --disable-multilib</userinput></screen>
 
     <variablelist os="af">
@@ -210,4 +211,12 @@
       </varlistentry>
 
+    <varlistentry os="af19">
+      <term><parameter>--disable-multilib</parameter></term>
+      <listitem>
+        <para>This option specifies that multiple target libraries should
+        not be built.</para>
+      </listitem>
+    </varlistentry>
+
     </variablelist>
 
Index: BOOK/cross-tools/common/uclibc.xml
===================================================================
--- BOOK/cross-tools/common/uclibc.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/common/uclibc.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -5,4 +5,6 @@
   %general-entities;
 ]>
+
+<!-- Common uClibc -->
 
 <sect1 id="ch-cross-tools-uclibc" role="wrap">
@@ -31,5 +33,5 @@
     <note os="a">
       <para>Below we are just telling uClibc to use its default configuration.
-      For those for more adventureous, you can use make menuconfig, and
+      For those for more adventurous, you can use make menuconfig, and
       do a more custom build for your uClibc installation.</para>
     </note>
@@ -48,5 +50,5 @@
     options that are architecture specifc that need to be set. The following
     command will only bring up items that need a value that we did not
-    specify in our Generic config file:</para>
+    specify in our generic config file patch:</para>
 
 <screen os="g"><userinput>make oldconfig</userinput></screen>
Index: BOOK/cross-tools/common/variables.xml
===================================================================
--- BOOK/cross-tools/common/variables.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/common/variables.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -14,5 +14,5 @@
 
 <screen os="b"><userinput>export CLFS_HOST=$(echo ${MACHTYPE} | sed "s/-[^-]*/-cross/")
-export CLFS_TARGET=<replaceable>[target triplet]</replaceable></userinput></screen>
+export CLFS_TARGET="<replaceable>[target triplet]</replaceable>"</userinput></screen>
 
   <para os="c">Now we will set the architecture and endianess of the CPU based
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/mips-chapter.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/uclibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/uclibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-final.xml"/>
 
Index: BOOK/cross-tools/mips/abi.xml
===================================================================
--- BOOK/cross-tools/mips/abi.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/mips/abi.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -25,10 +25,11 @@
   <table>
     <title>List of Build Variables</title>
-    <?dbfo table-width="3in" ?>
+    <?dbfo table-width="5.5in" ?>
 
     <tgroup cols="2">
 
       <colspec colnum="1" colwidth="1.5in" colname="ABI to Select"/>
-      <colspec colnum="2" colwidth="1.5in" colname="Variable Value"/>
+      <colspec colnum="2" colwidth="1.5in" colname="CLFS_ABI Value"/>
+      <colspec colnum="3" colwidth="2.5in" colname="Notes"/>
 
       <thead>
@@ -36,4 +37,5 @@
           <entry>ABI</entry>
           <entry>CLFS_ABI=Value</entry>
+          <entry>Notes</entry>
         </row>
       </thead>
@@ -41,14 +43,17 @@
       <tbody>
         <row>
-          <entry>32-Bit</entry>
+          <entry>O32</entry>
           <entry>32</entry>
+          <entry>For 32 bit CPUs only</entry>
         </row>
         <row>
           <entry>N32</entry>
           <entry>n32</entry>
+          <entry>For 64 bit CPUs operating in 32 bit mode</entry>
         </row>
         <row>
-          <entry>64-Bit</entry>
+          <entry>N64</entry>
           <entry>64</entry>
+          <entry>For 64 bit CPUs operating in 64 bit mode</entry>
         </row>
       </tbody>
Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -43,31 +43,11 @@
   --enable-languages=c --enable-c99 --enable-long-long \
   --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --with-abi=${CLFS_ABI}</userinput></screen>
+  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --with-abi=${CLFS_ABI} --with-arch=mips${CLFS_MIPS_LEVEL} \
+  --with-float=${CLFS_FLOAT} --with-endian=${CLFS_ENDIAN}</userinput></screen>
 
-    <variablelist os="af">
-      <title>The meaning of the configure options not used previously:</title>
-
-      <varlistentry os="af1">
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Enables the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af2">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af3">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/mips/gcc-static.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -48,5 +48,6 @@
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
   --disable-libssp --disable-threads --enable-languages=c \
-  --with-abi=${CLFS_ABI}</userinput></screen>
+  --disable-multilib --with-abi=${CLFS_ABI} --with-arch=mips${CLFS_MIPS_LEVEL} \
+  --with-float=${CLFS_FLOAT} --with-endian=${CLFS_ENDIAN}</userinput></screen>
 
 <!-- Common configure switches for all archs -->
@@ -62,4 +63,28 @@
       <listitem>
         <para>This option sets the ABI selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag2">
+      <term><parameter>--with-arch=mips${CLFS_MIPS_LEVEL}</parameter></term>
+      <listitem>
+        <para>This option sets the MIPS architecture ISA.  Generic options
+        that apply to this book are of the form "mips${CLFS_MIPS_LEVEL}".
+        For example, "mips1" or "mips3".  For a more expanded list of choices,
+        please see the GCC documentation at
+        <ulink url="http://gcc.gnu.org/onlinedocs/gcc/MIPS-Options.html" /></para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag3">
+      <term><parameter>--with-float=${CLFS_FLOAT}</parameter></term>
+      <listitem>
+        <para>This option sets the floating point mode selected earlier.</para>
+      </listitem>
+    </varlistentry>
+    <varlistentry os="ag4">
+      <term><parameter>--with-endian=${CLFS_ENDIAN}</parameter></term>
+      <listitem>
+        <para>This option sets the endianess of the CPU selected earlier.
+        GCC's configure scripts may not be able to determine the endianess
+        based only on the target triplet (as other architectures do).</para>
       </listitem>
     </varlistentry>
Index: BOOK/cross-tools/mips/uclibc.xml
===================================================================
--- BOOK/cross-tools/mips/uclibc.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
+++ BOOK/cross-tools/mips/uclibc.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<!-- MIPS uClibc -->
+
+<sect1 id="ch-cross-tools-uclibc" role="wrap">
+  <?dbhtml filename="uclibc.html"?>
+
+  <title>uClibc-&uclibc-version;</title>
+
+  <indexterm zone="ch-cross-tools-uclibc">
+    <primary sortas="a-uClibc">uClibc</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/uclibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of uClibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <para os="d">For the MIPS architecture, there are many different combinations
+    of configurations that can be used when building uClibc based on the choices
+    made previously for: endianess, ABI, and MIPS level.  To ensure that the
+    proper configuration is used based on those choices, first copy the configuration
+    matching the endianess chosen, then update the ABI and MIPS level:</para>
+
+<screen os="e"><userinput>cp -v clfs/config.${CLFS_ARCH}.${CLFS_ENDIAN} .config
+if [ "${CLFS_ABI}" == "n32" ]; \
+then sed -i s/CONFIG_MIPS_O32_ABI/CONFIG_MIPS_N32_ABI/g .config; \
+elif [ "${CLFS_ABI}" == "64" ]; \
+then sed -i s/CONFIG_MIPS_O32_ABI/CONFIG_MIPS_N64_ABI/g .config; fi; \
+if [ "${CLFS_MIPS_LEVEL}" == "3" ]; \
+then sed -i s/CONFIG_MIPS_ISA_1/CONFIG_MIPS_ISA_3/g .config; fi</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/uclibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/uclibc.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
+
+</sect1>
Index: BOOK/cross-tools/mips/variables.xml
===================================================================
--- BOOK/cross-tools/mips/variables.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/mips/variables.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -32,9 +32,15 @@
 
   <para os="m1">Now you will need to set the MIPS LEVEL. This determines how your
-uClibc is built. There are currently 5 MIPS ISA Levels. To keep things simple
-we are only using 2. For more information, go to
-<ulink url="http://www.linux-mips.org/wiki/Instruction_Set_Architecture"/></para>
+  GCC and uClibc are built. There are currently 5 MIPS ISA Levels. To keep things 
+  simple we are only using two. For more information, see
+  <ulink url="http://www.linux-mips.org/wiki/Instruction_Set_Architecture"/></para>
 
-<screen os="m2"><userinput>export CLFS_MIPS_LEVEL="{mips level}"</userinput></screen>
+<screen os="m2"><userinput>export CLFS_MIPS_LEVEL="<replaceable>[mips level]</replaceable>"</userinput></screen>
+
+  <para os="m3">We also need to select the floating point capability of the CPU.
+  If the CPU has built-in hardware for performing floating point calculations,
+  choose "hard", otherwise choose "soft":</para>
+
+<screen os="m4"><userinput>export CLFS_FLOAT="<replaceable>[hard or soft]</replaceable>"</userinput></screen>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -46,5 +52,6 @@
 echo export CLFS_ARCH=\""${CLFS_ARCH}\"" &gt;&gt; ~/.bashrc
 echo export CLFS_ENDIAN=\""${CLFS_ENDIAN}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_MIPS_LEVEL=\""${CLFS_MIPS_LEVEL}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+echo export CLFS_MIPS_LEVEL=\""${CLFS_MIPS_LEVEL}\"" &gt;&gt; ~/.bashrc
+echo export CLFS_FLOAT=\""${CLFS_FLOAT}\"" &gt;&gt; ~/.bashrc</userinput></screen>
 
   <table os="i">
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -43,32 +43,10 @@
   --enable-languages=c --enable-c99 --enable-long-long \
   --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
-  --with-mpc=${CLFS}/cross-tools --with-arch=${CLFS_CPU} \
-  --disable-multilib</userinput></screen>
+  --with-mpc=${CLFS}/cross-tools --disable-multilib \
+  --with-arch=${CLFS_CPU}</userinput></screen>
 
-    <variablelist os="af">
-      <title>The meaning of the configure options not used previously:</title>
-
-      <varlistentry os="af1">
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Enables the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af2">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af3">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='af'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-static.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/cross-tools/x86/gcc-static.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -48,5 +48,5 @@
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
   --disable-libssp --disable-threads --enable-languages=c \
-  --with-arch=${CLFS_CPU} --disable-multilib</userinput></screen>
+  --disable-multilib --with-arch=${CLFS_CPU}</userinput></screen>
 
 <!-- Common configure switches for all archs -->
@@ -63,12 +63,4 @@
         <para>This option configures the cross compiler to only output
         instructions for our previously selected CPU.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="ag2">
-      <term><parameter>--disable-multilib</parameter></term>
-      <listitem>
-        <para>This option specifies that multiple target libraries should
-        not be built.</para>
       </listitem>
     </varlistentry>
Index: BOOK/general.ent
===================================================================
--- BOOK/general.ent	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/general.ent	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -3,5 +3,5 @@
 <!ENTITY month "02"> <!-- Use two digits -->
 <!ENTITY month_name "February">
-<!ENTITY day "12"> <!-- Use two digits -->
+<!ENTITY day "24"> <!-- Use two digits -->
 <!ENTITY year "2011"> <!-- Use four digits -->
 
Index: BOOK/introduction/arm/changelog.xml
===================================================================
--- BOOK/introduction/arm/changelog.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/introduction/arm/changelog.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -34,9 +34,29 @@
 
     <listitem>
+      <para>February 24, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Added selection of ARM: arch, mode, float and
+          fpu.  These are now used with --disable-multilib when building
+          GCC.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>February 21, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Enabled support of EABI in uClibc configurations.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 10, 2011</para>
       <itemizedlist>
         <listitem>
           <para>[abradford] - Fixed builds for EABI (aapcs and aapcs-linux)
-          ABI choices by adding target triplets ending in uclibcgnueabi.</para>
+          ABI choices by adding target triplets ending in uclibceabi.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/introduction/common/changelog.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -36,4 +36,13 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>February 24, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Added --disable-multilib to GCC builds.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/introduction/mips/changelog.xml
===================================================================
--- BOOK/introduction/mips/changelog.xml	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ BOOK/introduction/mips/changelog.xml	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -34,4 +34,24 @@
 
     <listitem>
+      <para>February 24, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Added selection of MIPS arch, endian, and float.
+          These are now used when building GCC.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>February 21, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abradford] - Added support in uClibc for MIPS level 3
+          and ABI choices of n32 and n64.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 11, 2006</para>
       <itemizedlist>
Index: patches/uClibc-0.9.31-configs-2.patch
===================================================================
--- patches/uClibc-0.9.31-configs-2.patch	(revision a94e338a9edf4b9aaa8b4cd7d455ba42a8786c69)
+++ patches/uClibc-0.9.31-configs-2.patch	(revision bcfbe5bef5d0930e60d3b50fc7744315bfe72863)
@@ -5,227 +5,7 @@
 Upstream Status: None - CLFS Specific
 Description: Default configurations for CLFS builds of uClibc.
+Updated: 2011-02-15 by Andrew Bradford <bradfa@gmail.com>
+         Removed hppa and alpha architectures as they aren't used in embedded.
 
-diff -Naur uClibc-0.9.31.orig/clfs/config.alpha.little uClibc-0.9.31/clfs/config.alpha.little
---- uClibc-0.9.31.orig/clfs/config.alpha.little	1969-12-31 19:00:00.000000000 -0500
-+++ uClibc-0.9.31/clfs/config.alpha.little	2010-11-28 11:39:10.290656988 -0500
-@@ -0,0 +1,218 @@
-+#
-+# Automatically generated make config: don't edit
-+# Version: 0.9.31
-+# Sun Nov 28 10:26:37 2010
-+#
-+TARGET_alpha=y
-+# TARGET_arm is not set
-+# TARGET_avr32 is not set
-+# TARGET_bfin is not set
-+# TARGET_cris is not set
-+# TARGET_e1 is not set
-+# TARGET_frv is not set
-+# TARGET_h8300 is not set
-+# TARGET_hppa is not set
-+# TARGET_i386 is not set
-+# TARGET_i960 is not set
-+# TARGET_ia64 is not set
-+# TARGET_m68k is not set
-+# TARGET_microblaze is not set
-+# TARGET_mips is not set
-+# TARGET_nios is not set
-+# TARGET_nios2 is not set
-+# TARGET_powerpc is not set
-+# TARGET_sh is not set
-+# TARGET_sh64 is not set
-+# TARGET_sparc is not set
-+# TARGET_v850 is not set
-+# TARGET_vax is not set
-+# TARGET_x86_64 is not set
-+# TARGET_xtensa is not set
-+
-+#
-+# Target Architecture Features and Options
-+#
-+TARGET_ARCH="alpha"
-+FORCE_OPTIONS_FOR_ARCH=y
-+TARGET_SUBARCH=""
-+
-+#
-+# Using ELF file format
-+#
-+ARCH_LITTLE_ENDIAN=y
-+
-+#
-+# Using Little Endian
-+#
-+ARCH_HAS_MMU=y
-+ARCH_USE_MMU=y
-+UCLIBC_HAS_FLOATS=y
-+UCLIBC_HAS_FPU=y
-+DO_C99_MATH=y
-+# DO_XSI_MATH is not set
-+UCLIBC_HAS_FENV=y
-+KERNEL_HEADERS="${CLFS}/usr/include"
-+HAVE_DOT_CONFIG=y
-+
-+#
-+# General Library Settings
-+#
-+# HAVE_NO_PIC is not set
-+DOPIC=y
-+ARCH_HAS_NO_SHARED=y
-+ARCH_HAS_NO_LDSO=y
-+UCLIBC_CTOR_DTOR=y
-+# HAS_NO_THREADS is not set
-+LINUXTHREADS_OLD=y
-+# LINUXTHREADS_NEW is not set
-+UCLIBC_HAS_THREADS=y
-+# PTHREADS_DEBUG_SUPPORT is not set
-+UCLIBC_HAS_SYSLOG=y
-+UCLIBC_HAS_LFS=y
-+# MALLOC is not set
-+# MALLOC_SIMPLE is not set
-+MALLOC_STANDARD=y
-+MALLOC_GLIBC_COMPAT=y
-+UCLIBC_DYNAMIC_ATEXIT=y
-+# COMPAT_ATEXIT is not set
-+UCLIBC_SUSV3_LEGACY=y
-+# UCLIBC_SUSV3_LEGACY_MACROS is not set
-+# UCLIBC_SUSV4_LEGACY is not set
-+# UCLIBC_HAS_STUBS is not set
-+UCLIBC_HAS_SHADOW=y
-+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-+UCLIBC_HAS___PROGNAME=y
-+UCLIBC_HAS_PTY=y
-+ASSUME_DEVPTS=y
-+UNIX98PTY_ONLY=y
-+UCLIBC_HAS_GETPT=y
-+# UCLIBC_HAS_LIBUTIL is not set
-+UCLIBC_HAS_TM_EXTENSIONS=y
-+UCLIBC_HAS_TZ_CACHING=y
-+UCLIBC_HAS_TZ_FILE=y
-+UCLIBC_HAS_TZ_FILE_READ_MANY=y
-+UCLIBC_TZ_FILE_PATH="/etc/TZ"
-+
-+#
-+# Advanced Library Settings
-+#
-+UCLIBC_PWD_BUFFER_SIZE=256
-+UCLIBC_GRP_BUFFER_SIZE=256
-+
-+#
-+# Support various families of functions
-+#
-+UCLIBC_LINUX_MODULE_24=y
-+UCLIBC_LINUX_SPECIFIC=y
-+UCLIBC_HAS_GNU_ERROR=y
-+# UCLIBC_BSD_SPECIFIC is not set
-+# UCLIBC_HAS_BSD_ERR is not set
-+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-+# UCLIBC_NTP_LEGACY is not set
-+# UCLIBC_SV4_DEPRECATED is not set
-+UCLIBC_HAS_REALTIME=y
-+UCLIBC_HAS_ADVANCED_REALTIME=y
-+UCLIBC_HAS_EPOLL=y
-+UCLIBC_HAS_XATTR=y
-+UCLIBC_HAS_PROFILING=y
-+UCLIBC_HAS_CRYPT_IMPL=y
-+UCLIBC_HAS_CRYPT=y
-+UCLIBC_HAS_NETWORK_SUPPORT=y
-+UCLIBC_HAS_SOCKET=y
-+UCLIBC_HAS_IPV4=y
-+UCLIBC_HAS_IPV6=y
-+UCLIBC_HAS_RPC=y
-+UCLIBC_HAS_FULL_RPC=y
-+UCLIBC_HAS_REENTRANT_RPC=y
-+UCLIBC_USE_NETLINK=y
-+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-+# UCLIBC_HAS_BSD_RES_CLOSE is not set
-+UCLIBC_HAS_COMPAT_RES_STATE=y
-+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-+# UCLIBC_HAS_LIBRESOLV_STUB is not set
-+# UCLIBC_HAS_LIBNSL_STUB is not set
-+
-+#
-+# String and Stdio Support
-+#
-+# UCLIBC_HAS_STRING_GENERIC_OPT is not set
-+# UCLIBC_HAS_STRING_ARCH_OPT is not set
-+UCLIBC_HAS_CTYPE_TABLES=y
-+UCLIBC_HAS_CTYPE_SIGNED=y
-+# UCLIBC_HAS_CTYPE_UNSAFE is not set
-+# UCLIBC_HAS_CTYPE_CHECKED is not set
-+UCLIBC_HAS_CTYPE_ENFORCED=y
-+UCLIBC_HAS_WCHAR=y
-+# UCLIBC_HAS_LOCALE is not set
-+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-+UCLIBC_HAS_STDIO_GETC_MACRO=y
-+UCLIBC_HAS_STDIO_PUTC_MACRO=y
-+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-+UCLIBC_HAS_FOPEN_LARGEFILE_MODE=y
-+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-+UCLIBC_HAS_PRINTF_M_SPEC=y
-+UCLIBC_HAS_ERRNO_MESSAGES=y
-+UCLIBC_HAS_SYS_ERRLIST=y
-+UCLIBC_HAS_SIGNUM_MESSAGES=y
-+UCLIBC_HAS_SYS_SIGLIST=y
-+UCLIBC_HAS_GNU_GETOPT=y
-+UCLIBC_HAS_GNU_GETSUBOPT=y
-+
-+#
-+# Big and Tall
-+#
-+UCLIBC_HAS_REGEX=y
-+# UCLIBC_HAS_REGEX_OLD is not set
-+UCLIBC_HAS_FNMATCH=y
-+# UCLIBC_HAS_FNMATCH_OLD is not set
-+UCLIBC_HAS_WORDEXP=y
-+# UCLIBC_HAS_NFTW is not set
-+UCLIBC_HAS_GLOB=y
-+UCLIBC_HAS_GNU_GLOB=y
-+
-+#
-+# Library Installation Options
-+#
-+RUNTIME_PREFIX="/"
-+DEVEL_PREFIX="/usr/"
-+MULTILIB_DIR="lib"
-+HARDWIRED_ABSPATH=y
-+
-+#
-+# Security options
-+#
-+UCLIBC_HAS_ARC4RANDOM=y
-+# HAVE_NO_SSP is not set
-+# UCLIBC_HAS_SSP is not set
-+UCLIBC_BUILD_NOEXECSTACK=y
-+
-+#
-+# uClibc development/debugging options
-+#
-+CROSS_COMPILER_PREFIX="${CLFS_TARGET}-"
-+UCLIBC_EXTRA_CFLAGS=""
-+# DODEBUG is not set
-+# DODEBUG_PT is not set
-+DOSTRIP=y
-+# DOASSERTS is not set
-+# UCLIBC_MALLOC_DEBUGGING is not set
-+WARNINGS="-Wall"
-+# EXTRA_WARNINGS is not set
-+# DOMULTI is not set
-+# UCLIBC_MJN3_ONLY is not set
 diff -Naur uClibc-0.9.31.orig/clfs/config.arm.big uClibc-0.9.31/clfs/config.arm.big
 --- uClibc-0.9.31.orig/clfs/config.arm.big	1969-12-31 19:00:00.000000000 -0500
@@ -740,244 +520,4 @@
 +# DOMULTI is not set
 +# UCLIBC_MJN3_ONLY is not set
-diff -Naur uClibc-0.9.31.orig/clfs/config.hppa.big uClibc-0.9.31/clfs/config.hppa.big
---- uClibc-0.9.31.orig/clfs/config.hppa.big	1969-12-31 19:00:00.000000000 -0500
-+++ uClibc-0.9.31/clfs/config.hppa.big	2010-11-28 11:39:10.295156079 -0500
-@@ -0,0 +1,236 @@
-+#
-+# Automatically generated make config: don't edit
-+# Version: 0.9.31
-+# Sun Nov 28 10:26:15 2010
-+#
-+# TARGET_alpha is not set
-+# TARGET_arm is not set
-+# TARGET_avr32 is not set
-+# TARGET_bfin is not set
-+# TARGET_cris is not set
-+# TARGET_e1 is not set
-+# TARGET_frv is not set
-+# TARGET_h8300 is not set
-+TARGET_hppa=y
-+# TARGET_i386 is not set
-+# TARGET_i960 is not set
-+# TARGET_ia64 is not set
-+# TARGET_m68k is not set
-+# TARGET_microblaze is not set
-+# TARGET_mips is not set
-+# TARGET_nios is not set
-+# TARGET_nios2 is not set
-+# TARGET_powerpc is not set
-+# TARGET_sh is not set
-+# TARGET_sh64 is not set
-+# TARGET_sparc is not set
-+# TARGET_v850 is not set
-+# TARGET_vax is not set
-+# TARGET_x86_64 is not set
-+# TARGET_xtensa is not set
-+
-+#
-+# Target Architecture Features and Options
-+#
-+TARGET_ARCH="hppa"
-+FORCE_OPTIONS_FOR_ARCH=y
-+# CONFIG_GENERIC_386 is not set
-+# CONFIG_386 is not set
-+# CONFIG_486 is not set
-+# CONFIG_586 is not set
-+# CONFIG_586MMX is not set
-+# CONFIG_686 is not set
-+# CONFIG_PENTIUMII is not set
-+# CONFIG_PENTIUMIII is not set
-+# CONFIG_PENTIUM4 is not set
-+# CONFIG_K6 is not set
-+# CONFIG_K7 is not set
-+# CONFIG_ELAN is not set
-+# CONFIG_CRUSOE is not set
-+# CONFIG_WINCHIPC6 is not set
-+# CONFIG_WINCHIP2 is not set
-+# CONFIG_CYRIXIII is not set
-+# CONFIG_NEHEMIAH is not set
-+TARGET_SUBARCH=""
-+
-+#
-+# Using ELF file format
-+#
-+ARCH_BIG_ENDIAN=y
-+
-+#
-+# Using Big Endian
-+#
-+ARCH_HAS_MMU=y
-+ARCH_USE_MMU=y
-+UCLIBC_HAS_FLOATS=y
-+UCLIBC_HAS_FPU=y
-+DO_C99_MATH=y
-+# DO_XSI_MATH is not set
-+UCLIBC_HAS_FENV=y
-+KERNEL_HEADERS="${CLFS}/usr/include"
-+HAVE_DOT_CONFIG=y
-+
-+#
-+# General Library Settings
-+#
-+# HAVE_NO_PIC is not set
-+DOPIC=y
-+ARCH_HAS_NO_SHARED=y
-+ARCH_HAS_NO_LDSO=y
-+UCLIBC_CTOR_DTOR=y
-+# HAS_NO_THREADS is not set
-+LINUXTHREADS_OLD=y
-+# LINUXTHREADS_NEW is not set
-+UCLIBC_HAS_THREADS=y
-+# PTHREADS_DEBUG_SUPPORT is not set
-+UCLIBC_HAS_SYSLOG=y
-+UCLIBC_HAS_LFS=y
-+# MALLOC is not set
-+# MALLOC_SIMPLE is not set
-+MALLOC_STANDARD=y
-+MALLOC_GLIBC_COMPAT=y
-+UCLIBC_DYNAMIC_ATEXIT=y
-+# COMPAT_ATEXIT is not set
-+UCLIBC_SUSV3_LEGACY=y
-+# UCLIBC_SUSV3_LEGACY_MACROS is not set
-+# UCLIBC_SUSV4_LEGACY is not set
-+# UCLIBC_HAS_STUBS is not set
-+UCLIBC_HAS_SHADOW=y
-+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
-+UCLIBC_HAS___PROGNAME=y
-+UCLIBC_HAS_PTY=y
-+ASSUME_DEVPTS=y
-+UNIX98PTY_ONLY=y
-+UCLIBC_HAS_GETPT=y
-+# UCLIBC_HAS_LIBUTIL is not set
-+UCLIBC_HAS_TM_EXTENSIONS=y
-+UCLIBC_HAS_TZ_CACHING=y
-+UCLIBC_HAS_TZ_FILE=y
-+UCLIBC_HAS_TZ_FILE_READ_MANY=y
-+UCLIBC_TZ_FILE_PATH="/etc/TZ"
-+
-+#
-+# Advanced Library Settings
-+#
-+UCLIBC_PWD_BUFFER_SIZE=256
-+UCLIBC_GRP_BUFFER_SIZE=256
-+
-+#
-+# Support various families of functions
-+#
-+UCLIBC_LINUX_MODULE_24=y
-+UCLIBC_LINUX_SPECIFIC=y
-+UCLIBC_HAS_GNU_ERROR=y
-+# UCLIBC_BSD_SPECIFIC is not set
-+# UCLIBC_HAS_BSD_ERR is not set
-+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
-+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
-+# UCLIBC_NTP_LEGACY is not set
-+# UCLIBC_SV4_DEPRECATED is not set
-+UCLIBC_HAS_REALTIME=y
-+UCLIBC_HAS_ADVANCED_REALTIME=y
-+UCLIBC_HAS_EPOLL=y
-+UCLIBC_HAS_XATTR=y
-+UCLIBC_HAS_PROFILING=y
-+UCLIBC_HAS_CRYPT_IMPL=y
-+UCLIBC_HAS_CRYPT=y
-+UCLIBC_HAS_NETWORK_SUPPORT=y
-+UCLIBC_HAS_SOCKET=y
-+UCLIBC_HAS_IPV4=y
-+UCLIBC_HAS_IPV6=y
-+UCLIBC_HAS_RPC=y
-+UCLIBC_HAS_FULL_RPC=y
-+UCLIBC_HAS_REENTRANT_RPC=y
-+UCLIBC_USE_NETLINK=y
-+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
-+# UCLIBC_HAS_BSD_RES_CLOSE is not set
-+UCLIBC_HAS_COMPAT_RES_STATE=y
-+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
-+# UCLIBC_HAS_LIBRESOLV_STUB is not set
-+# UCLIBC_HAS_LIBNSL_STUB is not set
-+
-+#
-+# String and Stdio Support
-+#
-+# UCLIBC_HAS_STRING_GENERIC_OPT is not set
-+# UCLIBC_HAS_STRING_ARCH_OPT is not set
-+UCLIBC_HAS_CTYPE_TABLES=y
-+UCLIBC_HAS_CTYPE_SIGNED=y
-+# UCLIBC_HAS_CTYPE_UNSAFE is not set
-+# UCLIBC_HAS_CTYPE_CHECKED is not set
-+UCLIBC_HAS_CTYPE_ENFORCED=y
-+UCLIBC_HAS_WCHAR=y
-+# UCLIBC_HAS_LOCALE is not set
-+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
-+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
-+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
-+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
-+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
-+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
-+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
-+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
-+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
-+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
-+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
-+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
-+UCLIBC_HAS_STDIO_GETC_MACRO=y
-+UCLIBC_HAS_STDIO_PUTC_MACRO=y
-+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
-+UCLIBC_HAS_FOPEN_LARGEFILE_MODE=y
-+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
-+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
-+UCLIBC_HAS_PRINTF_M_SPEC=y
-+UCLIBC_HAS_ERRNO_MESSAGES=y
-+UCLIBC_HAS_SYS_ERRLIST=y
-+UCLIBC_HAS_SIGNUM_MESSAGES=y
-+UCLIBC_HAS_SYS_SIGLIST=y
-+UCLIBC_HAS_GNU_GETOPT=y
-+UCLIBC_HAS_GNU_GETSUBOPT=y
-+
-+#
-+# Big and Tall
-+#
-+UCLIBC_HAS_REGEX=y
-+# UCLIBC_HAS_REGEX_OLD is not set
-+UCLIBC_HAS_FNMATCH=y
-+# UCLIBC_HAS_FNMATCH_OLD is not set
-+UCLIBC_HAS_WORDEXP=y
-+# UCLIBC_HAS_NFTW is not set
-+UCLIBC_HAS_GLOB=y
-+UCLIBC_HAS_GNU_GLOB=y
-+
-+#
-+# Library Installation Options
-+#
-+RUNTIME_PREFIX="/"
-+DEVEL_PREFIX="/usr/"
-+MULTILIB_DIR="lib"
-+HARDWIRED_ABSPATH=y
-+
-+#
-+# Security options
-+#
-+UCLIBC_HAS_ARC4RANDOM=y
-+HAVE_NO_SSP=y
-+# PROPOLICE_BLOCK_ABRT is not set
-+# PROPOLICE_BLOCK_SEGV is not set
-+UCLIBC_BUILD_NOEXECSTACK=y
-+
-+#
-+# uClibc development/debugging options
-+#
-+CROSS_COMPILER_PREFIX="${CLFS_TARGET}-"
-+UCLIBC_EXTRA_CFLAGS=""
-+# DODEBUG is not set
-+# DODEBUG_PT is not set
-+DOSTRIP=y
-+# DOASSERTS is not set
-+# UCLIBC_MALLOC_DEBUGGING is not set
-+WARNINGS="-Wall"
-+# EXTRA_WARNINGS is not set
-+# DOMULTI is not set
-+# UCLIBC_MJN3_ONLY is not set
 diff -Naur uClibc-0.9.31.orig/clfs/config.i386.little uClibc-0.9.31/clfs/config.i386.little
 --- uClibc-0.9.31.orig/clfs/config.i386.little	1969-12-31 19:00:00.000000000 -0500
