Index: BOOK/Makefile
===================================================================
--- BOOK/Makefile	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/Makefile	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -4,5 +4,5 @@
 CHUNK_QUIET=1
 XSLROOTDIR=/usr/share/xml/docbook/xsl-stylesheets-current
-ARCH=x86 x86_64 x86_64-64 sparc sparcv8 sparc64 sparc64-64 mips mips64 mips64-64 ppc ppc64 alpha
+ARCH=x86 x86_64 x86_64-64 sparc sparc64 sparc64-64 mips mips64 mips64-64 ppc ppc64 alpha
 
 # HTML Rendering Chunked
Index: BOOK/cross-tools/alpha/glibc.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/alpha/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -34,12 +34,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/glibc.xml
===================================================================
--- BOOK/cross-tools/mips/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/mips/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -28,4 +28,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
@@ -34,20 +42,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/mips64-64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -28,4 +28,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
@@ -42,20 +50,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-64bit.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/mips64/glibc-64bit.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -29,4 +29,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
 
@@ -34,20 +42,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/mips64/glibc-n32.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -29,4 +29,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
 
@@ -34,20 +42,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/mips64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -28,4 +28,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
@@ -34,20 +42,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/sparc/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -34,12 +34,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/sparc64-64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -42,12 +42,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -34,12 +34,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/cross-tools/sparc64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -34,12 +34,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/cross-tools/sparcv8-chapter.xml
===================================================================
--- BOOK/cross-tools/sparcv8-chapter.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <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="sparcv8/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparcv8/binutils.xml
===================================================================
--- BOOK/cross-tools/sparcv8/binutils.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/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="../sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <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'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <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/sparcv8/glibc.xml
===================================================================
--- BOOK/cross-tools/sparcv8/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-<screen os="l2"><userinput>cd ..
-tar -jxvf glibc-ports-&glibc-ports-version;.tar.bz2
-cd glibc-ports-&glibc-ports-version;
-mv -v linuxthreads* ../glibc-&glibc-version;
-cd ../glibc-&glibc-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparcv8/glibc.xml"
-    xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <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="${LFS_TARGET}-gcc" \
-    AR="${LFS_TARGET}-ar" RANLIB="${LFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${LFS_TARGET} --build=${LFS_HOST} \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg1'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg2'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg3'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg4'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg5'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg6'])"/>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-       href="../common/glibc.xml"
-       xpointer="xpointer(//*[@os='dg9'])"/>
-
-   </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/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: OK/cross-tools/sparcv8/variables.xml
===================================================================
--- BOOK/cross-tools/sparcv8/variables.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/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>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export LFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: BOOK/final-system/alpha/glibc.xml
===================================================================
--- BOOK/final-system/alpha/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/alpha/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -37,12 +37,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips/glibc.xml
===================================================================
--- BOOK/final-system/mips/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/mips/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -30,4 +30,9 @@
     xpointer="xpointer(//*[@os='b'])"/>
 
+    <para os="g1">MIPS is no longer supported in the main glibc tree, so we have to
+    extract the glibc-ports into our glibc-&glibc-version; directory.</para>
+
+<screen os="g2"><userinput>tar -jxvf glibc-ports-&glibc-ports-version;.tar.bz2</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
@@ -37,12 +42,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-   <para os="p1">This patch will address a REMAP issue that occurs on the alpha/mips platforms:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&glibc-remap-patch;</userinput></screen>
-
-   <para os="m1">This patch will add NPTL support to MIPS, this will allow us to use NPTL:</para>
-
-<screen os="m2"><userinput>patch -Np1 -i ../&glibc-mips_nptl-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/mips64-64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -31,4 +31,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -37,20 +45,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/mips64/glibc-64bit.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -28,4 +28,12 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
@@ -33,20 +41,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/mips64/glibc-n32.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -27,4 +27,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -33,20 +41,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/glibc.xml
===================================================================
--- BOOK/final-system/mips64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/mips64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -32,4 +32,12 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../mips/glibc.xml"
+    xpointer="xpointer(//*[@os='g2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='c'])"/>
@@ -38,20 +46,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc/glibc.xml
===================================================================
--- BOOK/final-system/sparc/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/sparc/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -37,8 +37,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-   <para os="s1">This patch will add TLS (Thread Local Storage) support to Sparc:</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&glibc-sparc_tls-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/sparc64-64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -37,12 +37,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -33,12 +33,4 @@
     href="glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/final-system/sparc64/glibc.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -38,12 +38,4 @@
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/glibc.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: OK/final-system/sparcv8-chapter.xml
===================================================================
--- BOOK/final-system/sparcv8-chapter.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <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/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-libc-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/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="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.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/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.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/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparcv8/binutils.xml
===================================================================
--- BOOK/final-system/sparcv8/binutils.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../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='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="s3">This patch will fix issues with binutils Sparc aout support:</para>
-
-<screen os="s4"><userinput>patch -Np1 -i ../&binutils-sparc_aout-patch;</userinput></screen>
-
-    <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'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/sparcv8/glibc.xml
===================================================================
--- BOOK/final-system/sparcv8/glibc.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<para os="l1">This architecture does not support NPTL. So we need to untar the
-<filename>glibc-ports-&glibc-ports-version;.tar.bz2</filename> and move the
-linuxthreads directories. The following commands will accomplish the task:</para>
-
-<screen os="l2"><userinput>tar -jxvf glibc-ports-&glibc-ports-version;.tar.bz2 \
---strip-components=1 glibc-&glibc-ports-version;/linuxthreads*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-    
-    <para os="l3">NPTL is not supported on Sparc v8 and below, so we need to remove the NPTL from our build.
-    We do this by removing the NPTL directories:</para>
-
-<screen os="l4"><userinput>rm -rvf nptl*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/introduction/common/changelog.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -41,4 +41,7 @@
       <itemizedlist>
         <listitem>
+          <para>[jim] - Updated to Glibc 2.4.</para>
+        </listitem>
+        <listitem>
           <para>[jim] - Updated to latest bash patch -7.</para>
         </listitem>
Index: BOOK/materials/alpha/patches.xml
===================================================================
--- BOOK/materials/alpha/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/alpha/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -25,8 +25,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
   </variablelist>
 
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/mips/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -48,20 +48,4 @@
     href="../x86/patches.xml"
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="glibc-mips_nptl-patch">
-      <term>Glibc MIPS NPTL Patch - 16 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-mips_nptl-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibc-remap-patch">
-      <term>Glibc Remap Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-remap-patch;"/></para>
-      </listitem>
-    </varlistentry>
 
     <varlistentry os="grep-mips_update-patch">
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/mips64-64/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -43,12 +43,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/mips64/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -46,12 +46,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-mips_nptl-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-remap-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='grep-mips_update-patch'])"/>
 
Index: BOOK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/sparc/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -41,12 +41,4 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="glibc-sparc_tls-patch">
-      <term>Glibc Sparc TLS Patch - 3.4 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;glibc/&glibc-sparc_tls-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
    <varlistentry os="kbd-sparc_kbdrate-patch">
       <term>KBD kbdrate Patch - 1 KB:</term>
Index: BOOK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/sparc64-64/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -35,8 +35,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
Index: BOOK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/materials/sparc64/patches.xml	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -35,8 +35,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='glibc-sparc_tls-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
     xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
 
Index: OK/materials/sparcv8-chapter.xml
===================================================================
--- BOOK/materials/sparcv8-chapter.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <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/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparcv8/packages.xml
===================================================================
--- BOOK/materials/sparcv8/packages.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc">
-  <?dbhtml filename="packages-sparc.html"?>
-
-  <title>Additional Packages for Sparc</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="elftoaout">
-      <term>ELFtoaout (&elftoaout-version;) - &elftoaout-size;:</term>
-      <listitem>
-        <para><ulink url="&elftoaout-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibc-ports">
-      <term>Glibc (&glibc-ports-version;) - &glibc-ports-size;:</term>
-      <listitem>
-        <para><ulink url="&glibc-ports-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="silo">
-      <term>Silo (&silo-version;) - &silo-size;:</term>
-      <listitem>
-        <para><ulink url="&silo-url;"/></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="a">Total size of these packages: about 265 KB</para>
-
-</sect1>
Index: OK/materials/sparcv8/patches.xml
===================================================================
--- BOOK/materials/sparcv8/patches.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc">
-  <?dbhtml filename="patches-sparc.html"?>
-
-  <title>Additional Patches for Sparc</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='binutils-sparc_aout-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='kbd-sparc_kbdrate-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='linux-libc-headers-sparc_conflicts-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
-
-  </variablelist>
-
-</sect1>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/packages.ent	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -102,11 +102,11 @@
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
 
-<!ENTITY glibc-version "20051107">
-<!ENTITY glibc-size "15 MB">
-<!ENTITY glibc-url "ftp://ftp.lfs-matrix.net/pub/lfs/clfs-packages/common/glibc-&glibc-version;.tar.bz2">
-
-<!ENTITY glibc-ports-version "20051107">
-<!ENTITY glibc-ports-size "472 KB">
-<!ENTITY glibc-ports-url "ftp://ftp.lfs-matrix.net/pub/lfs/clfs-packages/sparcv8/glibc-ports-&glibc-ports-version;.tar.bz2">
+<!ENTITY glibc-version "2.4">
+<!ENTITY glibc-size "14.5 MB">
+<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
+
+<!ENTITY glibc-ports-version "&glibc-version;">
+<!ENTITY glibc-ports-size "534 KB">
+<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2">
 
 <!ENTITY grep-version "2.5.1a">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/patches.ent	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -24,8 +24,4 @@
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
 <!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
-<!ENTITY glibc-remap-patch "glibc-&glibc-version;-remap_update-1.patch">
-
-<!ENTITY glibc-linuxthreads-libgcc_eh-patch "glibc-&glibc-linuxthreads-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-linuxthreads-localedef_segfault-patch "glibc-&glibc-linuxthreads-version;-localedef_segfault-1.patch">
 
 <!ENTITY gzip-security_fix-patch "gzip-&gzip-version;-security_fixes-1.patch">
@@ -95,7 +91,4 @@
 <!ENTITY elftoaout-fixes-patch "elftoaout-&elftoaout-version;-64bit_fixes-1.patch">
 
-<!ENTITY glibc-sparc_tls-patch "glibc-&glibc-version;-sparc_tls-1.patch">
-<!ENTITY glibc-sparc_gcc4_fixes-patch "glibc-&glibc-linuxthreads-version;-sparc_gcc4_fixes-1.patch">
-
 <!ENTITY linux-libc-headers-sparc_biarch-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_biarch-1.patch">
 <!ENTITY linux-libc-headers-sparc_conflicts-patch "linux-libc-headers-&linux-libc-headers-version;-sparc_conflicts-1.patch">
@@ -120,6 +113,4 @@
 <!ENTITY gcc-mips_tls-patch "gcc-&gcc-version;-mips_tls-1.patch">
 
-<!ENTITY glibc-mips_nptl-patch "glibc-&glibc-version;-mips_nptl-1.patch">
-
 <!ENTITY grep-mips_update-patch "grep-&grep-version;-mips_config_update-1.patch">
 
@@ -141,3 +132,2 @@
 
 <!ENTITY aboot-alpha-patch "aboot-&aboot-version;-kernel26_gcc4_fixes-2.patch">
-
Index: OK/prologue/sparcv8/bookinfo.xml
===================================================================
--- BOOK/prologue/sparcv8/bookinfo.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-sparcv8;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/sparcv8-index.xml
===================================================================
--- BOOK/sparcv8-index.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/sparcv8/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/sparcv8-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the LFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparcv8-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: BOOK/stylesheets/top-index.xsl
===================================================================
--- BOOK/stylesheets/top-index.xsl	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ BOOK/stylesheets/top-index.xsl	(revision 81254183eb6b3a5d0bb28dc4643a449e727104d1)
@@ -132,13 +132,6 @@
           <li>
             <h4>
-              <a href="sparcv8">
-                <xsl:text>Sparc v8</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
               <a href="sparc">
-                <xsl:text>Sparc v9 and above</xsl:text>
+                <xsl:text>Sparc v8 and above</xsl:text>
               </a>
             </h4>
Index: OK/temp-system/sparcv8-chapter.xml
===================================================================
--- BOOK/temp-system/sparcv8-chapter.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <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/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparcv8/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.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/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparcv8/binutils.xml
===================================================================
--- BOOK/temp-system/sparcv8/binutils.xml	(revision e94ed9a7c433c5da04973681c115c498b3149777)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/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/sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='s3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/binutils.xml"
-    xpointer="xpointer(//*[@os='s4'])"/>
-
-    <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'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <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>
