Index: TODO
===================================================================
--- TODO	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
+++ TODO	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -0,0 +1,11 @@
+Todo's for RELEASE
+
+Wordsmith Text
+Correct URLS
+Make use of xincludes whenever possible
+Get 2.6.15 kernel in
+Fix udev when 2.6.15 goes in
+Get people to test builds
+
+Need What they are
+libmudflap
Index: cross-tools/alpha/gcc-final.xml
===================================================================
--- cross-tools/alpha/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/alpha/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/alpha/gcc-static.xml
===================================================================
--- cross-tools/alpha/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/alpha/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,13 +87,29 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ak'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/mips/gcc-final.xml
===================================================================
--- cross-tools/mips/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -95,22 +95,28 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
     <para>Continue with compiling the package:</para>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/mips/gcc-static.xml
===================================================================
--- cross-tools/mips/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -88,20 +88,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/mips64-64/gcc-final.xml
===================================================================
--- cross-tools/mips64-64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips64-64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -103,5 +103,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --target=${LFS_TARGET} --host=${LFS_HOST} --with-abi=64 \
     --with-local-prefix=/tools --disable-nls --enable-shared \
@@ -109,5 +109,5 @@
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
 
-    <variablelist>
+    <variablelist os="bg">
       <title>The meaning of the new configure options:</title>
 
@@ -121,32 +121,39 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bf1'])"/>
+      xpointer="xpointer(//*[@os='bg1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bf2'])"/>
+      xpointer="xpointer(//*[@os='bg2'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bf3'])"/>
+      xpointer="xpointer(//*[@os='bg3'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bf4'])"/>
+      xpointer="xpointer(//*[@os='bg4'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bf5'])"/>
+      xpointer="xpointer(//*[@os='bg5'])"/>
 
     </variablelist>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/mips64-64/gcc-static.xml
===================================================================
--- cross-tools/mips64-64/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips64-64/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -28,5 +28,7 @@
     xpointer="xpointer(//*[@os='aa'])"/>
 
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -54,11 +56,7 @@
     xpointer="xpointer(//*[@os='mb'])"/>
 
-    <para os="al">This will allow us to build a 64 bit ABI compiler instead of the default
-    n32:</para>
-
-<screen os="am"><userinput>patch -Np1 -i ../&gcc-mips_pure64-patch;</userinput></screen>
-
-    <para os="ag">Now we will need to setup our StartFile Spec to the correct library
-    location:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -90,5 +88,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${LFS_HOST} --target=${LFS_TARGET} --disable-mutlilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
@@ -97,13 +95,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-    <para>Install the package:</para>
-
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
 
   </sect2>
Index: cross-tools/mips64/gcc-final.xml
===================================================================
--- cross-tools/mips64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -95,22 +95,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/mips64/gcc-static.xml
===================================================================
--- cross-tools/mips64/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/mips64/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -88,20 +88,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='al'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/ppc/gcc-final.xml
===================================================================
--- cross-tools/ppc/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/ppc/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/ppc/gcc-static.xml
===================================================================
--- cross-tools/ppc/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/ppc/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -60,7 +60,7 @@
     xpointer="xpointer(//*[@os='ai'])"/>
 
-<screen os="aj"><userinput>cp gcc/Makefile.in{,.orig}
-sed "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
- gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -80,20 +80,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/sparc/gcc-final.xml
===================================================================
--- cross-tools/sparc/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/sparc/gcc-static.xml
===================================================================
--- cross-tools/sparc/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -80,20 +80,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- cross-tools/sparc64-64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc64-64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
-AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/sparc64-64/gcc-static.xml
===================================================================
--- cross-tools/sparc64-64/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc64-64/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -78,20 +78,25 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='al'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
 <screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" all-gcc</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/sparc64/gcc-final.xml
===================================================================
--- cross-tools/sparc64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
-AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/sparc64/gcc-static.xml
===================================================================
--- cross-tools/sparc64/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/sparc64/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -83,20 +83,25 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${LFS_HOST} --target=${LFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='al'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='am'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
 <screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" all-gcc</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/x86/gcc-final.xml
===================================================================
--- cross-tools/x86/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/x86/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -85,5 +85,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --enable-shared \
@@ -91,8 +91,8 @@
     --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
 
-    <variablelist os="bf">
+    <variablelist os="bg">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="bf1">
+      <varlistentry os="bg1">
         <term><parameter>--enable-languages=c,c++</parameter></term>
         <listitem>
@@ -101,5 +101,5 @@
       </varlistentry>
 
-      <varlistentry os="bf2">
+      <varlistentry os="bg2">
         <term><parameter>--enable-__cxa_atexit</parameter></term>
         <listitem>
@@ -112,5 +112,5 @@
       </varlistentry>
 
-      <varlistentry os="bf3">
+      <varlistentry os="bg3">
         <term><parameter>--enable-c99</parameter></term>
         <listitem>
@@ -119,5 +119,5 @@
       </varlistentry>
 
-      <varlistentry os="bf4">
+      <varlistentry os="bg4">
         <term><parameter>--enable-long-long</parameter></term>
         <listitem>
@@ -126,5 +126,5 @@
       </varlistentry>
 
-      <varlistentry os="bf5">
+      <varlistentry os="bg5">
         <term><parameter>--enable-threads=posix</parameter></term>
         <listitem>
@@ -135,12 +135,12 @@
     </variablelist>
 
-    <para>Continue with compiling the package:</para>
+    <para os="bh">Continue with compiling the package:</para>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
+<screen os="bi"><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
 LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="bj">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="bk"><userinput>make install</userinput></screen>
 
   </sect2>
Index: cross-tools/x86/gcc-static.xml
===================================================================
--- cross-tools/x86/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/x86/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -72,10 +72,10 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${LFS_HOST} --target=${LFS_TARGET} \
     --with-local-prefix=/tools --disable-nls --disable-shared \
     --disable-threads --enable-languages=c</userinput></screen>
 
-    <variablelist os="al">
+    <variablelist os="am">
       <title>The meaning of the configure options:</title>
 
@@ -117,11 +117,11 @@
     </variablelist>
 
-    <para>Continue with compiling the package:</para>
+    <para os="an">Continue with compiling the package:</para>
 
-<screen><userinput>make all-gcc</userinput></screen>
+<screen os="ao"><userinput>make all-gcc</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="ap">Install the package:</para>
 
-<screen><userinput>make install-gcc</userinput></screen>
+<screen os="aq"><userinput>make install-gcc</userinput></screen>
 
   </sect2>
Index: cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- cross-tools/x86_64-64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/x86_64-64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,22 +87,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${LFS_TARGET} --host=${LFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
     xpointer="xpointer(//*[@os='bf'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: cross-tools/x86_64-64/gcc-static.xml
===================================================================
--- cross-tools/x86_64-64/gcc-static.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/x86_64-64/gcc-static.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -78,5 +78,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --host=${LFS_HOST} --target=${LFS_TARGET} --disable-multilib \
     --with-local-prefix=/tools --disable-nls --disable-shared \
@@ -85,13 +85,25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
+    xpointer="xpointer(//*[@os='ak'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
 
-<screen><userinput>make all-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
 
-<screen><userinput>make install-gcc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
 
   </sect2>
Index: cross-tools/x86_64/gcc-final.xml
===================================================================
--- cross-tools/x86_64/gcc-final.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ cross-tools/x86_64/gcc-final.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,5 +87,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
+<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
     --target=${LFS_TARGET} --host=${LFS_HOST} \
     --with-local-prefix=/tools --disable-nls --enable-shared \
@@ -95,14 +95,21 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
+    xpointer="xpointer(//*[@os='bg'])"/>
 
-    <para>Continue with compiling the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
 
   </sect2>
Index: final-system/64/gcc.xml
===================================================================
--- final-system/64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -47,5 +47,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
     --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
     --enable-__cxa_atexit --enable-c99 --enable-long-long \
Index: final-system/common/gcc.xml
===================================================================
--- final-system/common/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/common/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -50,39 +50,35 @@
     <para os="h">Prepare GCC for compilation:</para>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
     --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
     --enable-__cxa_atexit --enable-c99 --enable-long-long \
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
-    <para os="i">Compile the package:</para>
-
-<screen os="j"><userinput>make</userinput></screen>
-
-    <important os="k">
+    <para os="j">Compile the package:</para>
+
+<screen os="k"><userinput>make</userinput></screen>
+
+    <important os="l">
       <para>In this section, the test suite for GCC is considered
       critical. Do not skip it under any circumstance.</para>
     </important>
 
-    <para os="l">Test the results, but do not stop at errors:</para>
-
-<screen os="m"><userinput>make -k check</userinput></screen>
-
-    <para os="n">The <parameter>-k</parameter> flag is used to make the test suite
+    <para os="m">Test the results, but do not stop at errors:</para>
+
+<screen os="n"><userinput>make -k check</userinput></screen>
+
+    <para os="o">The <parameter>-k</parameter> flag is used to make the test suite
     run through to completion and not stop at the first failure. The GCC test
     suite is very comprehensive and is almost guaranteed to generate a few
     failures. To receive a summary of the test suite results, run:</para>
 
-<screen os="o"><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
-
-    <para os="p">For only the summaries, pipe the output through
+<screen os="p"><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
+
+    <para os="q">For only the summaries, pipe the output through
     <userinput>grep -A7 Summ</userinput>.</para>
-
-    <para os="q">Results can be compared with those located at <ulink
-    url="&test-results;"/>.</para>
 
     <para os="r">A few unexpected failures cannot always be avoided. The
     GCC developers are usually aware of these issues, but have not
-    resolved them yet. Unless the test results are vastly different from
-    those at the above URL, it is safe to continue.</para>
+    resolved them yet.</para>
 
     <para os="s">Install the package:</para>
@@ -112,5 +108,6 @@
       <seglistitem>
         <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg>
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libstdc++.[a,so], and
+        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so], 
+        libmudflapth.[a,so], libstdc++.[a,so], and
         libsupc++.a</seg>
       </seglistitem>
Index: final-system/mips/gcc.xml
===================================================================
--- final-system/mips/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/mips/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -46,9 +46,4 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64-64/gcc.xml
===================================================================
--- final-system/mips64-64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/mips64-64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -30,8 +30,11 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
-    <para os="ma">The following patch ensures that TLS is utilized by GCC
-    for MIPS:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/gcc.xml"
+    xpointer="xpointer(//*[@os='ma'])"/>
 
-<screen os="mb"><userinput>patch -Np1 -i ../&gcc-mips_tls-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/gcc.xml"
+    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -55,8 +58,9 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix --with-abi=64 \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
+    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
+    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
+    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
+    --disable-multilib</userinput></screen>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: final-system/mips64/gcc.xml
===================================================================
--- final-system/mips64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/mips64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -22,8 +22,11 @@
     <title>Installation of GCC</title>
 
-    <para os="ma">The following patch ensures that TLS is utilized by GCC
-    for MIPS:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/gcc.xml"
+    xpointer="xpointer(//*[@os='ma'])"/>
 
-<screen os="mb"><userinput>patch -Np1 -i ../&gcc-mips_tls-patch;</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/gcc.xml"
+    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -47,7 +50,8 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
+<screen os="i"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+    ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
+    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
+    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
     --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
Index: final-system/multilib/gcc.xml
===================================================================
--- final-system/multilib/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ final-system/multilib/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -42,5 +42,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
+<screen os="i"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
     --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ introduction/common/changelog.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -38,4 +38,13 @@
 
    <listitem>
+      <para>November 27 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Text updates to gcc in all sections.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+   <listitem>
       <para>November 25 2005</para>
       <itemizedlist>
Index: temp-system/alpha/gcc.xml
===================================================================
--- temp-system/alpha/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/alpha/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -91,22 +91,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='ck'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -114,5 +119,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/mips/gcc.xml
===================================================================
--- temp-system/mips/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/mips/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -99,22 +99,26 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='ck'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
+
+<screen os="cn"><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
 AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -122,5 +126,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/mips64-64/gcc.xml
===================================================================
--- temp-system/mips64-64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/mips64-64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -115,5 +115,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -127,31 +127,39 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dc1'])"/>
+      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck1'])"/>
+      xpointer="xpointer(//*[@os='cl1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck2'])"/>
+      xpointer="xpointer(//*[@os='cl2'])"/>
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
-   <para>Now we copy the files that are placed in <filename class="directory">/tools/lib64
-   </filename> to <filename class="directory">/tools/lib</filename>.
-    We also delete the /tools/lib64 directory:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='dp'])"/>
 
-<screen><userinput>cp -ar /tools/lib64/* /tools/lib
-rm -rf /tools/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='dq'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -159,5 +167,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/mips64/gcc.xml
===================================================================
--- temp-system/mips64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/mips64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -107,7 +107,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
+    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} --with-abi=64 \
     --libexecdir=/tools/lib64 --with-local-prefix=/tools --enable-long-long \
     --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
@@ -118,12 +118,19 @@
     xpointer="xpointer(//*[@os='dc'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -131,5 +138,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/ppc/gcc.xml
===================================================================
--- temp-system/ppc/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/ppc/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -91,22 +91,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='ck'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cl'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -114,5 +119,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/sparc/gcc.xml
===================================================================
--- temp-system/sparc/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/sparc/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -91,22 +91,23 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='ck'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -114,5 +115,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/sparc64-64/gcc.xml
===================================================================
--- temp-system/sparc64-64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/sparc64-64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -99,10 +99,7 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib  \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='ck'])"/>
 
     <variablelist>
@@ -111,31 +108,35 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dc1'])"/>
+      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck1'])"/>
+      xpointer="xpointer(//*[@os='cl1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck2'])"/>
+      xpointer="xpointer(//*[@os='cl2'])"/>
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
-AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='dp'])"/>
 
-   <para>Now we copy the files that are placed in <filename class="directory">/tools/lib64
-   </filename> to <filename class="directory">/tools/lib</filename>.
-    We also delete the /tools/lib64 directory:</para>
-
-<screen><userinput>cp -ar /tools/lib64/* /tools/lib
-rm -rf /tools/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64-64/gcc.xml"
+    xpointer="xpointer(//*[@os='dq'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -143,5 +144,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/sparc64/gcc.xml
===================================================================
--- temp-system/sparc64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/sparc64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -99,23 +99,27 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
-    --libexecdir=/tools/lib64 --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86_64/gcc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86_64/gcc.xml"
+    xpointer="xpointer(//*[@os='db'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
+
+<screen os="cn"><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" CXXFLAGS_FOR_TARGET="${GCCTARGET}" \
 AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
     <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -123,5 +127,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/x86/gcc.xml
===================================================================
--- temp-system/x86/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/x86/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -87,5 +87,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
+<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
     --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
@@ -93,8 +93,8 @@
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
-    <variablelist os="ck">
+    <variablelist os="cl">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="ck1">
+      <varlistentry os="cl1">
         <term><parameter>--libexecdir=/tools/lib</parameter></term>
         <listitem>
@@ -103,5 +103,5 @@
       </varlistentry>
 
-      <varlistentry os="ck2">
+      <varlistentry os="cl2">
         <term><parameter>--disable-libstdcxx-pch</parameter></term>
         <listitem>
@@ -114,12 +114,12 @@
     </variablelist>
 
-    <para>Compile the package:</para>
+    <para os="cm">Compile the package:</para>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
+<screen os="cn"><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
 LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
 
-    <para>Install the package:</para>
+    <para os="co">Install the package:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen os="cp"><userinput>make install</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -127,5 +127,5 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+<screen os="cq"><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
 
   </sect2>
Index: temp-system/x86_64-64/gcc.xml
===================================================================
--- temp-system/x86_64-64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/x86_64-64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -99,5 +99,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -111,30 +111,37 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dc1'])"/>
+      xpointer="xpointer(//*[@os='dd1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck1'])"/>
+      xpointer="xpointer(//*[@os='cl1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck2'])"/>
+      xpointer="xpointer(//*[@os='cl2'])"/>
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-   LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
-   <para>Now we copy the files that are placed in <filename class="directory">/tools/lib64
+   <para os="dp">Now we copy the files that are placed in <filename class="directory">/tools/lib64
    </filename> to <filename class="directory">/tools/lib</filename>.
     We also delete the /tools/lib64 directory:</para>
 
-<screen><userinput>cp -ar /tools/lib64/* /tools/lib
+<screen os="dq"><userinput>cp -ar /tools/lib64/* /tools/lib
 rm -rf /tools/lib64</userinput></screen>
 
@@ -143,5 +150,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
Index: temp-system/x86_64/gcc.xml
===================================================================
--- temp-system/x86_64/gcc.xml	(revision 578c75fcac78a8aa485b2c0c7ed1961ea33aec11)
+++ temp-system/x86_64/gcc.xml	(revision 1b823a3741bc157a81c9abbd4407b7be83f7d1a5)
@@ -99,5 +99,5 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
     ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
     --build=${LFS_HOST} --host=${LFS_TARGET} --target=${LFS_TARGET} \
@@ -106,18 +106,19 @@
     --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
 
-    <variablelist os="dc">
+    <variablelist os="dd">
       <title>The meaning of the new configure options:</title>
 
-      <varlistentry os="dc1">
+      <varlistentry os="dd1">
         <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This forces the C++ compiler to use our Build 64 FLAGS.</para>
         </listitem>
       </varlistentry>
 
-      <varlistentry os="dc2">
+      <varlistentry os="dd2">
         <term><parameter>--libexecdir=/tools/lib64</parameter></term>
         <listitem>
-          <para>This do ...</para>
+          <para>This puts all files that are installed using the libexecdir
+          variable into /tools/lib64.</para>
         </listitem>
       </varlistentry>
@@ -125,16 +126,23 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../x86/gcc.xml"
-      xpointer="xpointer(//*[@os='ck2'])"/>
+      xpointer="xpointer(//*[@os='cl2'])"/>
 
     </variablelist>
 
-    <para>Compile the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
 
-<screen><userinput>make AS_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-as" \
-    LD_FOR_TARGET="/cross-tools/bin/${LFS_TARGET}-ld"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
 
-    <para>Install the package:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
 
-<screen><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -142,5 +150,7 @@
     xpointer="xpointer(//*[@os='w'])"/>
 
-<screen><userinput>ln -s gcc /tools/bin/cc</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../x86/gcc.xml"
+    xpointer="xpointer(//*[@os='cq'])"/>
 
   </sect2>
