Index: BOOK/cross-tools/ppc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-64-chapter.xml	(revision 94c9c5c7420028a3432113c392c39876c702dfee)
+++ BOOK/cross-tools/ppc64-64-chapter.xml	(revision 0a7039798033a0055cd9efbde1024b75bcfadd80)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64-64/gcc-final.xml"/>
 
Index: BOOK/cross-tools/ppc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/glibc.xml	(revision 94c9c5c7420028a3432113c392c39876c702dfee)
+++ 	(revision )
@@ -1,156 +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/2001/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GLIBC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-      AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-      ../glibc-&glibc-version;/configure --prefix=/tools \
-      --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-      --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
-      --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-      --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../multilib/glibc-64bit.xml"
-      xpointer="xpointer(//*[@os='fa1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg11'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg12'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </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/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision 94c9c5c7420028a3432113c392c39876c702dfee)
+++ BOOK/cross-tools/ppc64-chapter.xml	(revision 0a7039798033a0055cd9efbde1024b75bcfadd80)
@@ -27,8 +27,8 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/cloog.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-static.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-static.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ppc64/gcc-final.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mips64/gcc-final.xml"/>
 
 </chapter>
Index: BOOK/cross-tools/ppc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-final.xml	(revision 94c9c5c7420028a3432113c392c39876c702dfee)
+++ 	(revision )
@@ -1,95 +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/2001/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/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/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/ppc64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-static.xml	(revision 94c9c5c7420028a3432113c392c39876c702dfee)
+++ 	(revision )
@@ -1,116 +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/2001/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/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../multilib/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ar'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='as'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='at'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
