Index: OK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-   --disable-nls --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/binutils.xml"
-      xpointer="xpointer(//*[@os='bd8'])"/>
-
- </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/64/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/64/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,111 @@
+<?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;
+]>
+
+<sect1 id="ch-cross-tools-gcc-final" role="wrap">
+  <?dbhtml filename="gcc-final.html"?>
+
+  <title>Cross GCC-&gcc-version; - Final</title>
+
+  <indexterm zone="ch-cross-tools-gcc-final">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>cross tools, final</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ai'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bf'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/64/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/64/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,118 @@
+<?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;
+]>
+
+<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="../../final-system/common/gcc.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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    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="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <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='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='al'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ao'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/common/binutils.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -53,7 +53,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-    --disable-nls --enable-shared --disable-multilib</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
+  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
+  --enable-64-bit-bfd --disable-multilib</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/common/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -63,11 +63,4 @@
     xpointer="xpointer(//*[@os='aj'])"/>
 
-    <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
-    so it doesn't pick up the host's header files:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig &gt; \
-    configure</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="gcc-static.xml"
@@ -83,10 +76,10 @@
 
 <screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
+  --enable-long-long --enable-threads=posix --disable-multilib</userinput></screen>
 
     <variablelist os="bg">
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -45,7 +45,6 @@
     location:</para>
 
-<screen os="ah"><userinput>for file in $(find gcc/config  -name linux.h -o -name linux64.h ! -wholename gcc/config/linux.h)
-do echo -e '\n#undef STARTFILE_PREFIX_SPEC\n#define STARTFILE_PREFIX_SPEC "/tools/lib/"' &gt;&gt; ${file}
-done</userinput></screen>
+<screen os="ah"><userinput>echo -en '\n#undef STANDARD_STARTFILE_PREFIX_1\n#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"\n' >> gcc/config/linux.h
+echo -en '\n#undef STANDARD_STARTFILE_PREFIX_2\n#define STANDARD_STARTFILE_PREFIX_2 ""\n' >> gcc/config/linux.h</userinput></screen>
 
     <para os="ai">Now alter <command>gcc</command>'s c preprocessor's default
@@ -74,11 +73,11 @@
 
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float \
+  --disable-libgomp --disable-libmudflap --disable-libssp \
+  --disable-threads --enable-languages=c --disable-multilib</userinput></screen>
 
     <variablelist os="am">
Index: BOOK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/mips64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -21,5 +21,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.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="mips64-64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -75,12 +75,11 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="bf" ><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib \
-   ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST}
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --enable-languages=c,c++ --enable-__cxa_atexit --disable-multilib \
-    --enable-c99 --enable-long-long --enable-threads=posix \
-    --with-abi=64</userinput></screen>
+<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
+  --enable-long-long --enable-threads=posix --with-abi=64</userinput></screen>
 
     <variablelist os="bg">
Index: BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/mips64-64/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -29,5 +29,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -37,5 +37,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
@@ -85,12 +85,11 @@
 
 <screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared  --disable-threads --enable-languages=c \
-    --with-abi=64</userinput></screen>
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float \
+  --disable-libgomp --disable-libmudflap --disable-libssp \
+  --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/mips64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -22,9 +22,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-n32.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/multilib/binutils.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -63,7 +63,8 @@
     xpointer="xpointer(//*[@os='i'])"/>
 
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-   --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
+<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure \
+  --prefix=/cross-tools --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-lib-path=/tools/lib --disable-nls --enable-shared \
+  --enable-64-bit-bfd</userinput></screen>
 
     <variablelist os="bd">
Index: BOOK/cross-tools/multilib/gcc-final.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/multilib/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,115 @@
+<?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;
+]>
+
+<sect1 id="ch-cross-tools-gcc-final" role="wrap">
+  <?dbhtml filename="gcc-final.html"?>
+
+  <title>Cross GCC-&gcc-version; - Final</title>
+
+  <indexterm zone="ch-cross-tools-gcc-final">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>cross tools, final</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ai'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
+  --with-mpfr=/cross-tools --with-gmp=/cross-tools --enable-c99 \
+  --enable-long-long --enable-threads=posix</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bi'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/multilib/gcc-static.xml
===================================================================
--- BOOK/cross-tools/multilib/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/multilib/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,123 @@
+<?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;
+]>
+
+<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="../../final-system/common/gcc.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='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <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='t1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='t2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
+  ../gcc-&gcc-version;/configure --prefix=/cross-tools \
+  --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --with-local-prefix=/tools --disable-nls \
+  --disable-shared --with-mpfr=/cross-tools --with-gmp=/cross-tools \
+  --without-headers --with-newlib --disable-decimal-float \
+  --disable-libgomp --disable-libmudflap --disable-libssp \
+  --disable-threads --enable-languages=c</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='am'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='an'])"/>
+
+<screen os="s1"><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ap'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aq'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/native-chapter.xml
===================================================================
--- BOOK/cross-tools/native-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/native-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -14,12 +14,13 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc-static.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="x86/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
 
 </chapter>
Index: OK/cross-tools/native/binutils.xml
===================================================================
--- BOOK/cross-tools/native/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-sysroot=${CLFS} \
-    --with-lib-path=/tools/lib --disable-nls --enable-shared --disable-multilib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/native/gcc-final.xml
===================================================================
--- BOOK/cross-tools/native/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools --with-sysroot=${CLFS} \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --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="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/native/gcc-static.xml
===================================================================
--- BOOK/cross-tools/native/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?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;
-]>
-
-<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="../../final-system/common/gcc.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="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <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='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools --with-sysroot=${CLFS} \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/native/variables.xml
===================================================================
--- BOOK/cross-tools/native/variables.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/native/variables.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,32 @@
+<?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;
+]>
+
+<sect1 id="ch-cross-tools-variables">
+  <?dbhtml filename="variables.html"?>
+
+  <title>Build Variables</title>
+
+  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
+
+  <para os="a">During the building of the cross-compile tools you will need to
+  set a few variables that will be dependent on your particular needs.
+  The first variable will be the triplet of the host machine, which will be
+  put into the <envar>CLFS_HOST</envar> variable. To account for the
+  possibility that the host and target are the same arch, as cross-compiling
+  won't work when host and target are the same, part of the triplet needs to
+  be changed slightly to add "cross". Set <envar>CLFS_HOST</envar> using the
+  following command:</para>
+
+<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | \
+    sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
+
+  <para os="c">Now you will need to set the triplet for the target
+  architecture. Set the target variable using the following command:</para>
+
+<screen os="d"><userinput>export CLFS_TARGET="$MACHTYPE"</userinput></screen>
+
+</sect1>
Index: BOOK/cross-tools/native64-chapter.xml
===================================================================
--- BOOK/cross-tools/native64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/native64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
@@ -21,9 +21,9 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>
Index: OK/cross-tools/native64/binutils.xml
===================================================================
--- BOOK/cross-tools/native64/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-sysroot=${CLFS} \
-   --with-lib-path=/tools/lib --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd6'])"/>
-
-      <varlistentry os="bd8">
-        <term><parameter>--enable-64-bit-bfd</parameter></term>
-        <listitem>
-          <para>This adds 64 bit support to Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/native64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/native64/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools --with-sysroot=${CLFS} \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --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="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/native64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/native64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?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;
-]>
-
-<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="../../final-system/common/gcc.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='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <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='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools --with-sysroot=${CLFS} \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/ppc64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -22,8 +22,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/sparc64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -21,8 +21,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-static.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="64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/sparc64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/sparc64-64/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -29,5 +29,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
@@ -37,5 +37,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
+    href="../64/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
@@ -96,5 +96,7 @@
     xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/sparc64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -25,5 +25,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/sparc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/cross-tools/sparc64/gcc-final.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,110 @@
+<?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;
+]>
+
+<sect1 id="ch-cross-tools-gcc-final" role="wrap">
+  <?dbhtml filename="gcc-final.html"?>
+
+  <title>Cross GCC-&gcc-version; - Final</title>
+
+  <indexterm zone="ch-cross-tools-gcc-final">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>cross tools, final</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ag'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='ai'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="gcc-static.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/gcc-final.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bh'])"/>
+
+<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
+    LD_FOR_TARGET="${CLFS_TARGET}-ld" CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='bk'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/sparc64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/sparc64/gcc-static.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -85,5 +85,5 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-static.xml"
+    href="../multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='al'])"/>
 
@@ -96,5 +96,5 @@
     xpointer="xpointer(//*[@os='an'])"/>
 
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
+<screen os="s1"><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}"</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/x86_64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -21,8 +21,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-static.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="64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc-final.xml"/>
 
 </chapter>
Index: OK/cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?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;
-]>
-
-<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="../../final-system/common/gcc.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='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    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="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <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='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/cross-tools/x86_64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -22,8 +22,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc-final.xml"/>
 
 </chapter>
Index: OK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <para os="bd">Finally, disable <option>-B</option> in
-    <filename>configure</filename> so wrong architecture libraries are not
-    picked up, as -B is not expanded by the multilib spec:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig &gt; \
-    configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-local-prefix=/tools --disable-nls \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --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="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-static.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?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;
-]>
-
-<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="../../final-system/common/gcc.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='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <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='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>AR=ar LDFLAGS="-Wl,-rpath,/cross-tools/lib" \
-    ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --build=${CLFS_HOST} --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls \
-    --without-headers --with-newlib --disable-decimal-float \
-    --with-mpfr=/cross-tools --with-gmp=/cross-tools \
-    --disable-libgomp --disable-libmudflap --disable-libssp \
-    --disable-shared --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/introduction/common/changelog.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -36,4 +36,13 @@
     </listitem>
 -->
+
+    <listitem>
+      <para>January 17, 2009</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Jim] - Toolchain Updates from Ryan.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
Index: BOOK/temp-system/64/gcc.xml
===================================================================
--- BOOK/temp-system/64/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/temp-system/64/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,126 @@
+<?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;
+]>
+
+<sect1 id="ch-temp-system-gcc" role="wrap">
+  <?dbhtml filename="gcc.html"?>
+
+  <title>GCC-&gcc-version;</title>
+
+  <indexterm zone="ch-temp-system-gcc">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>temporary system</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/64/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cf'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
+    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
+    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
+    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the new configure options:</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      href="../multilib/gcc.xml"
+      xpointer="xpointer(//*[@os='dd1'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      href="../common/gcc.xml"
+      xpointer="xpointer(//*[@os='cl1'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
+
+   <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 os="dq"><userinput>cp -va /tools/lib64/* /tools/lib
+rm -rvf /tools/lib64</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/common/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -47,11 +47,4 @@
     xpointer="xpointer(//*[@os='ad'])"/>
 
-    <para os="cd">Now we will change <command>cpp</command>'s search path so it
-     won't look in <filename class="directory">/usr/include</filename>:</para>
-
-<screen os="ce"><userinput>cp -v gcc/cppdefault.c{,.orig}
-sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0@g' \
-    gcc/cppdefault.c.orig &gt; gcc/cppdefault.c</userinput></screen>
-
     <para os="cf">Also, we need to set the directory searched by the fixincludes
     process for system headers, so it won't look at the host's headers:</para>
@@ -77,8 +70,9 @@
 
 <screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --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>
+  --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
+  --with-sysroot=${CLFS} --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 \
+  --disable-multilib</userinput></screen>
 
     <variablelist os="cl">
Index: BOOK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/mips64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: OK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --with-abi=64 \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/mips64/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -24,34 +24,26 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ab'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ac'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
+    href="../../cross-tools/multilib/gcc-static.xml"
     xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -62,12 +54,4 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -87,13 +71,14 @@
     xpointer="xpointer(//*[@os='h'])"/>
 
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-abi=64 --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
+<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+  ../gcc-&gcc-version;/configure --prefix=/tools \
+  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+  --target=${CLFS_TARGET} --with-sysroot=${CLFS} --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 --with-abi=64</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
+    href="../multilib/gcc.xml"
     xpointer="xpointer(//*[@os='dd'])"/>
 
Index: BOOK/temp-system/multilib/gcc.xml
===================================================================
--- BOOK/temp-system/multilib/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
+++ BOOK/temp-system/multilib/gcc.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -0,0 +1,123 @@
+<?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;
+]>
+
+<sect1 id="ch-temp-system-gcc" role="wrap">
+  <?dbhtml filename="gcc.html"?>
+
+  <title>GCC-&gcc-version;</title>
+
+  <indexterm zone="ch-temp-system-gcc">
+    <primary sortas="a-GCC">GCC</primary>
+    <secondary>temporary system</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../../final-system/common/gcc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='aa'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ab'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ac'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../cross-tools/multilib/gcc-static.xml"
+    xpointer="xpointer(//*[@os='ad'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cf'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cg'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
+  ../gcc-&gcc-version;/configure --prefix=/tools \
+  --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET} \
+  --target=${CLFS_TARGET} --with-sysroot=${CLFS} --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>
+
+    <variablelist os="dd">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry os="dd1">
+        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
+        <listitem>
+          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
+        </listitem>
+      </varlistentry>
+
+      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+      href="../common/gcc.xml"
+      xpointer="xpointer(//*[@os='cl1'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cm'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cn'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='co'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='cp'])"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-gcc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/temp-system/native-chapter.xml
===================================================================
--- BOOK/temp-system/native-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/native-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -16,6 +16,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/gcc.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.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/bash.xml"/>
Index: OK/temp-system/native/binutils.xml
===================================================================
--- BOOK/temp-system/native/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --disable-nls --enable-shared --disable-multilib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/native/gcc.xml
===================================================================
--- BOOK/temp-system/native/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,115 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <para os="cd">Now we will change <command>cpp</command>'s search path so it     won't look in <filename class="directory">/usr/include</filename>:</para>
-
-<screen os="ce"><userinput>cp -v gcc/cppdefault.c{,.orig}
-sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0@g' \
-    gcc/cppdefault.c.orig &gt; gcc/cppdefault.c</userinput></screen>
-
-    <para os="cf">Also, we need to set the directory searched by the fixincludes
-    process for system headers, so it won't look at the host's headers:</para>
-
-<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
-    gcc/Makefile.in.orig &gt; gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="cj">Before starting to build GCC, remember to unset any environment
-    variables that override the default optimization flags.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --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>
-
-    <variablelist os="cl">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="cl1">
-        <term><parameter>--disable-libstdcxx-pch</parameter></term>
-        <listitem>
-          <para>Do not build the pre-compiled header (PCH) for
-          <filename class="libraryfile">libstdc++</filename>. It takes
-          up a lot of space, and we have no use for it.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="cm">Compile the package:</para>
-
-<screen os="cn"><userinput>make AS_FOR_TARGET="${AS}" \
-    LD_FOR_TARGET="${LD}"</userinput></screen>
-
-    <para os="co">Install the package:</para>
-
-<screen os="cp"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/native64-chapter.xml
===================================================================
--- BOOK/temp-system/native64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/native64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -16,6 +16,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/mpfr.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native64/bash.xml"/>
Index: OK/temp-system/native64/binutils.xml
===================================================================
--- BOOK/temp-system/native64/binutils.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>CC="gcc ${BUILD64}" \
-    ../binutils-&binutils-version;/configure --prefix=/tools \
-    --libdir=/tools/lib64 --with-lib-path=/tools/lib \
-    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
-
-    <variablelist os="ea">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Tells the compiler to use our 64-bit build flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/native64/gcc.xml
===================================================================
--- BOOK/temp-system/native64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <para os="da">When searching for the multilibs, force the build to use the
-    results of <option>--print-multi-lib</option> from our cross-compiler,
-    not the native compiler <command>gcc</command> builds now:</para>
-
-<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
-sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
-   gcc/Makefile.in.orig2 &gt; gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="dc"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/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>
-
-    <variablelist os="dd">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/ppc64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -17,5 +17,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: BOOK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/sparc64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: OK/temp-system/sparc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64-64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/sparc64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: OK/temp-system/sparc64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/x86_64-64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: OK/temp-system/x86_64-64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64-64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-   <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 os="dq"><userinput>cp -va /tools/lib64/* /tools/lib
-rm -rvf /tools/lib64</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ BOOK/temp-system/x86_64-chapter.xml	(revision c1832dac36338cbea43e6d9f57dcc83282389d4f)
@@ -18,5 +18,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
Index: OK/temp-system/x86_64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64/gcc.xml	(revision 0defd7d0999d62a81670218821aadf876192d06b)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?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;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <para os="da">When searching for the multilibs, force the build to use the
-    results of <option>--print-multi-lib</option> from our cross-compiler,
-    not the native compiler <command>gcc</command> builds now:</para>
-
-<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
-sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
-   gcc/Makefile.in.orig2 &gt; gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --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>
-
-    <variablelist os="dd">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
