Index: BOOK/cross-tools/arm-chapter.xml
===================================================================
--- BOOK/cross-tools/arm-chapter.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/arm-chapter.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -21,5 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpc.xml"/>
   <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="common/gcc-static.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="common/gcc-final.xml"/>
Index: BOOK/cross-tools/arm/gcc-static.xml
===================================================================
--- BOOK/cross-tools/arm/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
+++ BOOK/cross-tools/arm/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -0,0 +1,91 @@
+<?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 GCC-Static -->
+
+<sect1 id="ch-cross-tools-gcc-static" role="wrap">
+  <?dbhtml filename="gcc-static.html"?>
+
+  <title>Cross GCC-&gcc-version; - Static</title>
+
+  <indexterm zone="ch-cross-tools-gcc-static">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>cross tools, static</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --disable-nls  --disable-shared \
+  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
+  --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
+  --disable-decimal-float --disable-libgomp --disable-libmudflap \
+  --disable-libssp --disable-threads --enable-languages=c \
+  --with-abi=${CLFS_ABI}</userinput></screen>
+
+<!-- Common configure switches for all archs -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='af'])"/>
+
+<!-- Specific configure switches for ARM -->
+  <variablelist os="ag">
+
+    <varlistentry os="ag1">
+      <term><parameter>--with-abi=${CLFS_ABI}</parameter></term>
+      <listitem>
+        <para>This option sets the ABI selected earlier.</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ah'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ai'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='aj'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ak'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
+
+</sect1>
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -71,5 +71,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
+    xpointer="xpointer(//*[@os='ah'])"/>
 
 <screen os="ah"><userinput>make</userinput></screen>
@@ -77,5 +77,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
+    xpointer="xpointer(//*[@os='aj'])"/>
 
 <screen os="aj"><userinput>make install</userinput></screen>
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -25,5 +25,5 @@
 
   <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
+    <title os="a">Installation of Cross GCC Compiler with Static libgcc
     and no Threads</title>
 
@@ -36,4 +36,6 @@
     <para os="e">Prepare GCC for compilation:</para>
 
+<!-- This is the common configure line for GCC-Static. -->
+<!-- It's not actually used by any arch but is here for reference. -->
 <screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
   ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
@@ -43,6 +45,5 @@
   --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
   --disable-decimal-float --disable-libgomp --disable-libmudflap \
-  --disable-libssp --disable-threads --enable-languages=c \
-  --with-abi=${CLFS_ABI}</userinput></screen>
+  --disable-libssp --disable-threads --enable-languages=c</userinput></screen>
 
     <variablelist os="af">
@@ -207,20 +208,13 @@
       </varlistentry>
 
-      <varlistentry os="af19">
-        <term><parameter>--with-abi=${CLFS_ABI}</parameter></term>
-        <listitem>
-          <para>This option sets the ABI selected earlier.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
-    <para os="ag">Continue with compiling the package:</para>
-
-<screen os="ah"><userinput>make all-gcc all-target-libgcc</userinput></screen>
-
-    <para os="ai">Install the package:</para>
-
-<screen os="aj"><userinput>make install-gcc install-target-libgcc</userinput></screen>
+    <para os="ah">Continue with compiling the package:</para>
+
+<screen os="ai"><userinput>make all-gcc all-target-libgcc</userinput></screen>
+
+    <para os="aj">Install the package:</para>
+
+<screen os="ak"><userinput>make install-gcc install-target-libgcc</userinput></screen>
 
   </sect2>
Index: BOOK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/mips-chapter.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -21,5 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpc.xml"/>
   <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="common/gcc-static.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="common/gcc-final.xml"/>
Index: BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
+++ BOOK/cross-tools/mips/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -0,0 +1,91 @@
+<?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 GCC-Static -->
+
+<sect1 id="ch-cross-tools-gcc-static" role="wrap">
+  <?dbhtml filename="gcc-static.html"?>
+
+  <title>Cross GCC-&gcc-version; - Static</title>
+
+  <indexterm zone="ch-cross-tools-gcc-static">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>cross tools, static</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='c'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='d'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='e'])"/>
+
+<screen os="ae"><userinput>AR=ar LDFLAGS="-Wl,-rpath,${CLFS}/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=${CLFS}/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --disable-nls  --disable-shared \
+  --with-mpfr=${CLFS}/cross-tools --with-gmp=${CLFS}/cross-tools \
+  --with-mpc=${CLFS}/cross-tools --without-headers --with-newlib \
+  --disable-decimal-float --disable-libgomp --disable-libmudflap \
+  --disable-libssp --disable-threads --enable-languages=c \
+  --with-abi=${CLFS_ABI}</userinput></screen>
+
+<!-- Common configure switches for all archs -->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='af'])"/>
+
+<!-- Specific configure switches for MIPS -->
+  <variablelist os="ag">
+
+    <varlistentry os="ag1">
+      <term><parameter>--with-abi=${CLFS_ABI}</parameter></term>
+      <listitem>
+        <para>This option sets the ABI selected earlier.</para>
+      </listitem>
+    </varlistentry>
+
+  </variablelist>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ah'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ai'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='aj'])"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ak'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
+
+</sect1>
Index: BOOK/cross-tools/x86/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-static.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/x86/gcc-static.xml	(revision ae51e2a61963df1116a719e788035559d84dc1bf)
@@ -5,4 +5,6 @@
   %general-entities;
 ]>
+
+<!-- x86 GCC-Static -->
 
 <sect1 id="ch-cross-tools-gcc-static" role="wrap">
@@ -16,15 +18,13 @@
   </indexterm>
 
-  <sect2 role="package">
-    <title/>
-
-    <para>The GCC package contains the GNU compiler collection, which includes
-    the C and C++ compilers.</para>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
 
   <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='a'])"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -50,186 +50,29 @@
   --with-arch=${CLFS_CPU} --disable-multilib</userinput></screen>
 
-    <variablelist os="af">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="af1">
-        <term><parameter>--prefix=${CLFS}/cross-tools</parameter></term>
-        <listitem>
-          <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">${CLFS}/cross-tools</filename>
-          directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af2">
-        <term><parameter>--build=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>This tells the configure script the triplet to use to build GCC.
-          It will use ${CLFS_HOST} as that's where it's being built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af3">
-        <term><parameter>--host=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>This tells the configure script the triplet of the machine GCC 
-          will be executed on when actually cross compiling.  It will use 
-          ${CLFS_HOST} as that's where GCC will execute when cross compiling
-          software later.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af4">
-        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>This tells the configure script the triplet of the machine GCC
-          will build executables for.  It will use ${CLFS_TARGET} so that software
-          compiled with this version of GCC can be executed on the embedded machine
-          target.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af5">
-        <term><parameter>--with-sysroot=${CLFS}</parameter></term>
-        <listitem>
-          <para>This tells configure that ${CLFS} is going to be the root
-          of our system. It will now use the specified sysroot, ${CLFS}, as
-          a prefix of the default search paths.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af6">
-        <term><parameter>--disable-nls</parameter></term>
-        <listitem>
-          <para>This disables internationalization as i18n is not needed for the
-          cross-compile tools.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af7">
-        <term><parameter>--disable-shared</parameter></term>
-        <listitem>
-          <para>Disables the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af8">
-        <term><parameter>--with-mpfr=${CLFS}/cross-tools</parameter></term>
-        <listitem>
-          <para>Tells configure where to find the 
-          <filename class="directory">lib</filename> and 
-          <filename class="directory">include</filename> directories
-          that contain MPFR which was built earlier.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af9">
-        <term><parameter>--with-gmp=${CLFS}/cross-tools</parameter></term>
-        <listitem>
-          <para>Tells configure where to find the 
-          <filename class="directory">lib</filename> and 
-          <filename class="directory">include</filename> directories
-          that contain GMP which was built earlier.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af10">
-        <term><parameter>--with-mpc=${CLFS}/cross-tools</parameter></term>
-        <listitem>
-          <para>Tells configure where to find the 
-          <filename class="directory">lib</filename> and 
-          <filename class="directory">include</filename> directories
-          that contain MPC which was built earlier.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af11">
-        <term><parameter>--without-headers</parameter></term>
-        <listitem>
-          <para>Tells configure to not use any headers from any C libraries.
-          This is needed as we haven't yet built the C library and to prevent
-          influence from the host environment.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af12">
-        <term><parameter>--with-newlib</parameter></term>
-        <listitem>
-          <para>Tells configure to build libgcc without needing any C
-          libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af13">
-        <term><parameter>--disable-decimal-float</parameter></term>
-        <listitem>
-          <para>Tells configure to disable IEEE 754-2008 decimal floating
-          point support.  Decimal floating point support isn't needed yet.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af14">
-        <term><parameter>--disable-libgomp</parameter></term>
-        <listitem>
-          <para>Tells configure to not build the GOMP run-time libraries.
-          GOMP is the GNU implementation of OpenMP, a API for shared-memory
-          parallel programming.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af15">
-        <term><parameter>--disable-libmudflap</parameter></term>
-        <listitem>
-          <para>Tells configure to not build libmudflap.  Mudflap is a 
-          library that can be used to help check for proper pointer usage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af16">
-        <term><parameter>--disable-libssp</parameter></term>
-        <listitem>
-          <para>Tells configure not to build run-time libraries for stack
-          smashing detection.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af17">
-        <term><parameter>--disable-threads</parameter></term>
-        <listitem>
-          <para>This will prevent GCC from looking for the multi-thread
-          include files, since they haven't been created for this architecture
-          yet. GCC will be able to find the multi-thread information after
-          the glib headers are created.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af18">
-        <term><parameter>--enable-languages=c</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C compiler is built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af19">
-        <term><parameter>--with-arch=${CLFS_CPU}</parameter></term>
-        <listitem>
-          <para>This option configures the cross compiler to only output
-          instructions for our previously selected CPU.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="af20">
-        <term><parameter>--disable-multilib</parameter></term>
-        <listitem>
-          <para>This option specifies that multiple target libraries should
-          not be built.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
+<!-- Common configure switches for all archs -->
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
   href="../common/gcc-static.xml"
-  xpointer="xpointer(//*[@os='ag'])"/>
+  xpointer="xpointer(//*[@os='af'])"/>
+
+<!-- Specific configure switches for x86 -->
+  <variablelist os="ag">
+
+    <varlistentry os="ag1">
+      <term><parameter>--with-arch=${CLFS_CPU}</parameter></term>
+      <listitem>
+        <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>
+
+  </variablelist>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -245,13 +88,13 @@
   xpointer="xpointer(//*[@os='aj'])"/>
 
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@os='ak'])"/>
 
   </sect2>
 
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/gcc-static.xml"
+  xpointer="xpointer(//*[@role='content'])"/>
+
 </sect1>
