Index: BOOK/cross-tools/native-chapter.xml
===================================================================
--- BOOK/cross-tools/native-chapter.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ BOOK/cross-tools/native-chapter.xml	(revision 061db064cdc47d8930838b3ae08b4ecf99ef1920)
@@ -14,8 +14,12 @@
   <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/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/toolchain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/glibc.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/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="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="common/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/native/cflags.xml
===================================================================
--- BOOK/cross-tools/native/cflags.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,28 +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-cflags">
-  <?dbhtml filename="cflags.html"?>
-
-  <title>Build CFLAGS</title>
-
-  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
-  set during the building of cross-tools.</para>
-
-  <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-  use the following commands:</para>
-
-<screen><userinput>unset CFLAGS
-unset CXXFLAGS</userinput></screen>
-
-  <para>Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen><userinput>echo unset CFLAGS &gt;&gt; ~/.bashrc
-echo unset CXXFLAGS &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: BOOK/cross-tools/native/gcc.xml
===================================================================
--- BOOK/cross-tools/native/gcc.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,152 +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" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-cross-tools-gcc">
-    <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="../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'])"/>
-
-    <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="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --disable-multilib --with-local-prefix=/tools --disable-nls \
-    --enable-shared --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>--enable-languages=c,c++</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C and C++ compilers are built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg2">
-        <term><parameter>--enable-__cxa_atexit</parameter></term>
-        <listitem>
-          <para>This option allows use of __cxa_atexit, rather than atexit,
-          to register C++ destructors for local statics and global objects
-          and is essential for fully standards-compliant handling of destructors.
-          It also affects the C++ ABI and therefore results in C++ shared libraries
-          and C++ programs that are interoperable with other Linux distributions.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg3">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg4">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg5">
-        <term><parameter>--enable-threads=posix</parameter></term>
-        <listitem>
-          <para>This enables C++ exception handling for multi-threaded code.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Continue with compiling the package:</para>
-
-<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
-    LD_FOR_TARGET="${CLFS_TARGET}-ld"</userinput></screen>
-
-    <para os="bj">Install the package:</para>
-
-<screen os="bk"><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/cross-tools/native/glibc.xml
===================================================================
--- BOOK/cross-tools/native/glibc.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,200 +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-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <para os="da">It should be noted that compiling Glibc in any way other than
-    the method suggested in this book puts the stability of the system at
-    risk.</para>
-
-    <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
-
-<screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="dd">The following lines need to be added to
-    <filename>config.cache</filename> for Glibc to support NPTL:</para>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_gnu89_inline=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dg1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This sets Glibc to use the current compiler on our system. This is
-          used to create the tools Glibc uses during its build.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg2">
-        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the GCC compiler that we made for our target
-          architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg3">
-        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ar</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg4">
-        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ranlib</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This builds the libraries without profiling information. 
-	  Omit this option if profiling on the temporary tools is necessary.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize all add-ons that are
-          available.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use Thread Local Storage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg8">
-        <term><parameter>--enable-kernel=2.6.0</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile the library with support
-          for 2.6.x Linux kernels.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg9">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use use the __thread for libc and
-          libpthread builds.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg10">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the Binutils that are specific to
-          our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg11">
-        <term><parameter>--with-headers=/tools/include</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile itself against the headers
-          recently installed to the <filename class="directory">/tools</filename>
-          directory, so that it knows exactly what features the kernel has
-          and can optimize itself accordingly.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg12">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize a premade cache file.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="dh">During this stage the following warning might appear:</para>
-
-<blockquote os="di"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dj">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dk">Compile the package:</para>
-
-<screen os="dl"><userinput>make</userinput></screen>
-
-    <para os="dm">Install the package:</para>
-
-<screen os="dn"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/native/toolchain.xml
===================================================================
--- BOOK/cross-tools/native/toolchain.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,195 +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-toolchain" role="wrap">
-  <?dbhtml filename="toolchain.html"?>
-
-  <title>Toolchain</title>
-
-  <indexterm zone="ch-cross-tools-toolchain">
-    <primary sortas="a-toolchain">ToolChain</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>This section combines Binutils, GCC, GMP, and MPFR  packages
-    to create a clean toolchain.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of our Toolchain</title>
-
-    <para os="na">We are going to extract all the files needed
-   to create our toolchain:</para>
-
-<screen os="nb"><userinput>tar -jxf ../gcc-&gcc-version;.tar.bz2
-tar -jxf ../binutils-&binutils-version;.tar.bz2
-tar -jxf ../mfpr-&mpfr-version;.tar.bz2
-tar -jxf ../gmp-&gmp-version;.tar.bz2</userinput></screen>
-
-    <para os="nc">We are going to create a combined directory for
-   or build:</para>
-
-<screen os="nd"><userinput>mkdir -pv sysroot-toolchain
-cd gcc-&gcc-version;; tar -c * | \
-  ( cd ../sysroot-toolchain ; tar xf - )
-cd ../binutils-&binutils-version;; tar -c * | \
-  ( cd ../sysroot-toolchain ; tar xf - )
-cd ../sysroot-toolchain
-mv ../mpfr-&mpfr-version; ./mpfr
-mv ../gmp-&gmp-version; ./gmp</userinput></screen>
-
-    <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/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="../../temp-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../temp-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="ng">This ensures by default the compiler will look in
-/tools/lib/../lib or /tools/lib/../lib64 as appropriate:</para>
-
-<screen os="nh"><userinput>echo "
-#undef STANDARD_STARTFILE_PREFIX_1
-#undef STANDARD_STARTFILE_PREFIX_2
-#define STANDARD_STARTFILE_PREFIX_1 \"/tools/lib/\"
-#define STANDARD_STARTFILE_PREFIX_2 \"\"" &gt;&gt; gcc/config/linux.h</userinput></screen>
-
-    <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'])"/>
-
-    <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="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="bf"><userinput>AR=ar AS=as ../sysroot-toolchain/configure \
-  --with-sysroot=${CLFS} --prefix=/cross-tools \
-  --target=i686-pc-linux-gnu --with-local-prefix=/tools \
-  --without-headers --with-newlib  --disable-nls \
-  --disable-shared  --disable-decimal-float  --disable-libgomp \
-  --disable-libmudflap --disable-libssp --disable-threads \
-  --enable-languages=c --enable-64-bit-bfd --with-lib-path=/tools/lib</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>--enable-languages=c,c++</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C and C++ compilers are built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg2">
-        <term><parameter>--enable-__cxa_atexit</parameter></term>
-        <listitem>
-          <para>This option allows use of __cxa_atexit, rather than atexit,
-          to register C++ destructors for local statics and global objects
-          and is essential for fully standards-compliant handling of destructors.
-          It also affects the C++ ABI and therefore results in C++ shared libraries
-          and C++ programs that are interoperable with other Linux distributions.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg3">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg4">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg5">
-        <term><parameter>--enable-threads=posix</parameter></term>
-        <listitem>
-          <para>This enables C++ exception handling for multi-threaded code.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Continue with compiling the package:</para>
-
-<screen os="bi"><userinput>make</userinput></screen>
-
-    <para os="bj">Install the package:</para>
-
-<screen os="bk"><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/cross-tools/native64-chapter.xml
===================================================================
--- BOOK/cross-tools/native64-chapter.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ BOOK/cross-tools/native64-chapter.xml	(revision 061db064cdc47d8930838b3ae08b4ecf99ef1920)
@@ -14,9 +14,16 @@
   <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="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/toolchain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="native/glibc.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="x86_64/linux-headers.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="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="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"/>
 
 </chapter>
Index: BOOK/cross-tools/native64/cflags.xml
===================================================================
--- BOOK/cross-tools/native64/cflags.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,28 +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-cflags">
-  <?dbhtml filename="cflags.html"?>
-
-  <title>Build CFLAGS</title>
-
-  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
-  set during the building of cross-tools.</para>
-
-  <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-  use the following commands:</para>
-
-<screen><userinput>unset CFLAGS
-unset CXXFLAGS</userinput></screen>
-
-  <para>Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen><userinput>echo unset CFLAGS &gt;&gt; ~/.bashrc
-echo unset CXXFLAGS &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: BOOK/cross-tools/native64/gcc.xml
===================================================================
--- BOOK/cross-tools/native64/gcc.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,120 +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" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-cross-tools-gcc">
-    <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="../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'])"/>
-
-    <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="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>AR=ar ../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../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/native64/glibc.xml
===================================================================
--- BOOK/cross-tools/native64/glibc.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,200 +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-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <para os="da">It should be noted that compiling Glibc in any way other than
-    the method suggested in this book puts the stability of the system at
-    risk.</para>
-
-    <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
-
-<screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="dd">The following lines need to be added to
-    <filename>config.cache</filename> for Glibc to support NPTL:</para>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_gnu89_inline=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dg1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This sets Glibc to use the current compiler on our system. This is
-          used to create the tools Glibc uses during its build.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg2">
-        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the GCC compiler that we made for our target
-          architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg3">
-        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ar</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg4">
-        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ranlib</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This builds the libraries without profiling information. 
-	  Omit this option if profiling on the temporary tools is necessary.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize all add-ons that are
-          available.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use Thread Local Storage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg8">
-        <term><parameter>--enable-kernel=2.6.0</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile the library with support
-          for 2.6.x Linux kernels.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg9">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use use the __thread for libc and
-          libpthread builds.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg10">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the Binutils that are specific to
-          our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg11">
-        <term><parameter>--with-headers=/tools/include</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile itself against the headers
-          recently installed to the <filename class="directory">/tools</filename>
-          directory, so that it knows exactly what features the kernel has
-          and can optimize itself accordingly.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg12">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize a premade cache file.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="dh">During this stage the following warning might appear:</para>
-
-<blockquote os="di"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dj">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dk">Compile the package:</para>
-
-<screen os="dl"><userinput>make</userinput></screen>
-
-    <para os="dm">Install the package:</para>
-
-<screen os="dn"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/native64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/native64/linux-headers.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,49 +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-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make headers_check
-make INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/native64/toolchain.xml
===================================================================
--- BOOK/cross-tools/native64/toolchain.xml	(revision 4837ea34f0b41a281bd860ad4f6923d11aa87938)
+++ 	(revision )
@@ -1,202 +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-toolchain" role="wrap">
-  <?dbhtml filename="toolchain.html"?>
-
-  <title>Toolchain</title>
-
-  <indexterm zone="ch-cross-tools-toolchain">
-    <primary sortas="a-toolchain">ToolChain</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>This section combines Binutils, GCC, GMP, and MPFR  packages
-    to create a clean toolchain.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of our Toolchain</title>
-
-    <para os="na">We are going to extract all the files needed
-   to create our toolchain:</para>
-
-<screen os="nb"><userinput>tar -jxf ../gcc-&gcc-version;.tar.bz2
-tar -jxf ../binutils-&binutils-version;.tar.bz2
-tar -jxf ../mfpr-&mpfr-version;.tar.bz2
-tar -jxf ../gmp-&gmp-version;.tar.bz2</userinput></screen>
-
-    <para os="nc">We are going to create a combined directory for
-   or build:</para>
-
-<screen os="nd"><userinput>mkdir -pv sysroot-toolchain
-cd gcc-&gcc-version;; tar -c * | \
-  ( cd ../sysroot-toolchain ; tar xf - )
-cd ../binutils-&binutils-version;; tar -c * | \
-  ( cd ../sysroot-toolchain ; tar xf - )
-cd ../sysroot-toolchain
-mv ../mpfr-&mpfr-version; ./mpfr
-mv ../gmp-&gmp-version; ./gmp</userinput></screen>
-
-    <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="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <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="../../temp-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../temp-system/common/gmp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../native/gcc.xml"
-    xpointer="xpointer(//*[@os='ng'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../native/gcc.xml"
-    xpointer="xpointer(//*[@os='nh'])"/>
-
-    <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'])"/>
-
-    <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="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="bf"><userinput>AR=ar AS=as ../sysroot-toolchain/configure \
-  --with-sysroot=${CLFS} --prefix=/cross-tools \
-  --target=x86_64-pc-linux-gnu --with-local-prefix=/tools \
-  --without-headers --with-newlib  --disable-nls \
-  --disable-shared  --disable-decimal-float  --disable-libgomp \
-  --disable-libmudflap --disable-libssp --disable-threads \
-  --enable-languages=c --enable-64-bit-bfd --with-lib-path=/tools/lib</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>--enable-languages=c,c++</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C and C++ compilers are built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg2">
-        <term><parameter>--enable-__cxa_atexit</parameter></term>
-        <listitem>
-          <para>This option allows use of __cxa_atexit, rather than atexit,
-          to register C++ destructors for local statics and global objects
-          and is essential for fully standards-compliant handling of destructors.
-          It also affects the C++ ABI and therefore results in C++ shared libraries
-          and C++ programs that are interoperable with other Linux distributions.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg3">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg4">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg5">
-        <term><parameter>--enable-threads=posix</parameter></term>
-        <listitem>
-          <para>This enables C++ exception handling for multi-threaded code.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Continue with compiling the package:</para>
-
-<screen os="bi"><userinput>make</userinput></screen>
-
-    <para os="bj">Install the package:</para>
-
-<screen os="bk"><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>
