Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -46,12 +46,4 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips/gcc-static.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -47,12 +47,4 @@
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -46,12 +46,4 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips64-64/gcc-static.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -47,12 +47,4 @@
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-final.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips64/gcc-final.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -46,12 +46,4 @@
     href="gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-static.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/cross-tools/mips64/gcc-static.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -47,12 +47,4 @@
     href="../x86/gcc-static.xml"
     xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips/gcc.xml
===================================================================
--- BOOK/final-system/mips/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/final-system/mips/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -21,9 +21,4 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
-    <para os="ma">The following patch ensures that TLS is utilized by GCC
-    for MIPS:</para>
-
-<screen os="mb"><userinput>patch -Np1 -i ../&gcc-mips_tls-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/gcc.xml
===================================================================
--- BOOK/final-system/mips64-64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/final-system/mips64-64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -29,12 +29,4 @@
     href="../64/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/final-system/mips64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/introduction/common/changelog.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -38,4 +38,13 @@
 
     <listitem>
+      <para>April 13, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to GCC 4.1.0.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 12, 2006</para>
       <itemizedlist>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/common/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -92,5 +92,5 @@
 
     <varlistentry>
-      <term>GCC Posix Patch - 8.6 KB:</term>
+      <term>GCC Posix Patch - 9 KB:</term>
       <listitem>
         <para><ulink
Index: BOOK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/mips/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -34,12 +34,4 @@
         <para><ulink
         url="&patches-root;file/&file-mips_update-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="gcc-mips_tls-patch">
-      <term>GCC MIPS TLS Patch - 16 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-mips_tls-patch;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/mips64-64/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -28,8 +28,4 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/mips64/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -35,8 +35,4 @@
     href="../mips/patches.xml"
     xpointer="xpointer(//*[@os='file-mips_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-mips_tls-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/x86/patches.xml
===================================================================
--- BOOK/materials/x86/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/x86/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -22,5 +22,5 @@
 
     <varlistentry os="gcc-specs-patch">
-      <term>GCC Specs Patch - 14 KB:</term>
+      <term>GCC Specs Patch - 15 KB:</term>
       <listitem>
         <para><ulink
Index: BOOK/materials/x86_64-64/patches.xml
===================================================================
--- BOOK/materials/x86_64-64/patches.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/materials/x86_64-64/patches.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -26,5 +26,5 @@
 
     <varlistentry os="gcc-pure64-patch">
-      <term>GCC Pure 64 Patch - 6.3 KB:</term>
+      <term>GCC Pure 64 Patch - 6.4 KB:</term>
       <listitem>
         <para><ulink
@@ -34,5 +34,5 @@
 
     <varlistentry os="gcc-specs_pure64-patch">
-      <term>GCC Specs Patch - 14 KB:</term>
+      <term>GCC Specs Patch - 15 KB:</term>
       <listitem>
         <para><ulink
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/packages.ent	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -94,6 +94,6 @@
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2">
 
-<!ENTITY gcc-version "4.0.3">
-<!ENTITY gcc-size "32 MB">
+<!ENTITY gcc-version "4.1.0">
+<!ENTITY gcc-size "37 MB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
 
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/patches.ent	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -33,6 +33,4 @@
 
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
-
-<!ENTITY ncurses-update-patch "ncurses-&ncurses-version;-20050827-patch.sh.bz2">
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
@@ -110,7 +108,4 @@
 <!ENTITY file-mips_update-patch "file-&file-version;-mips_config_update-1.patch">
 
-<!ENTITY gcc-mips_pure64-patch "gcc-&gcc-version;-mips_pure64-1.patch">
-<!ENTITY gcc-mips_tls-patch "gcc-&gcc-version;-mips_tls-1.patch">
-
 <!ENTITY glibc-mips-patch "glibc-&glibc-version;-mips_fixes-1.patch">
 
Index: BOOK/temp-system/alpha/gcc.xml
===================================================================
--- BOOK/temp-system/alpha/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/alpha/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/alpha/gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: BOOK/temp-system/mips/gcc.xml
===================================================================
--- BOOK/temp-system/mips/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/mips/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -48,12 +48,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cd'])"/>
@@ -70,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -48,12 +48,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cd'])"/>
@@ -70,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/mips64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -48,12 +48,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='ma'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/gcc.xml"
-    xpointer="xpointer(//*[@os='mb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cd'])"/>
@@ -70,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/ppc/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/ppc/gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: BOOK/temp-system/ppc64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/ppc64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -62,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc/gcc.xml
===================================================================
--- BOOK/temp-system/sparc/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/sparc/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -64,12 +64,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../cross-tools/sparc/gcc-static.xml"
     xpointer="xpointer(//*[@os='ak'])"/>
Index: BOOK/temp-system/sparc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64-64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/sparc64-64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -62,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/sparc64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -62,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86/gcc.xml
===================================================================
--- BOOK/temp-system/x86/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/x86/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -60,11 +60,4 @@
 sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
-    <para os="ch">Use our cross-compiler instead of the one GCC builds, named
-    <command>xgcc</command>:</para>
-
-<screen os="ci"><userinput>cp -v gcc/mklibgcc.in{,.orig}
-sed -e "s@\./xgcc@/cross-tools/bin/${CC}@g" \
-   gcc/mklibgcc.in.orig > gcc/mklibgcc.in</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86_64-64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64-64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/x86_64-64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -62,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86_64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64/gcc.xml	(revision e7a7a6fece3fe67080477acfee6d571022e6e0f0)
+++ BOOK/temp-system/x86_64/gcc.xml	(revision fb773d9ced2eee065a021c3a63bcc3b21c38f78c)
@@ -62,12 +62,4 @@
     href="../x86/gcc.xml"
     xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/gcc.xml"
-    xpointer="xpointer(//*[@os='ci'])"/>
 
     <para os="da">When searching for the multilibs, force the build to use the
