Changeset cc5fa6e for BOOK

Timestamp:

May 25, 2006, 10:47:48 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

d62f5b5

Parents:

89336bc

Message:

r3618@server: jim | 2006-05-25 10:46:12 -0700
Updated to GCC 4.1.1

Location:

BOOK

Files:

• cross-tools/alpha/gcc-final.xml (modified) (1 diff)
• cross-tools/mips/gcc-final.xml (modified) (1 diff)
• cross-tools/mips64-64/gcc-final.xml (modified) (1 diff)
• cross-tools/mips64/gcc-final.xml (modified) (1 diff)
• cross-tools/ppc/gcc-final.xml (modified) (1 diff)
• cross-tools/ppc64/gcc-final.xml (modified) (1 diff)
• cross-tools/sparc/gcc-final.xml (modified) (1 diff)
• cross-tools/sparc64-64/gcc-final.xml (modified) (1 diff)
• cross-tools/sparc64/gcc-final.xml (modified) (1 diff)
• cross-tools/x86/gcc-final.xml (modified) (1 diff)
• cross-tools/x86_64-64/gcc-final.xml (modified) (1 diff)
• cross-tools/x86_64/gcc-final.xml (modified) (1 diff)
• final-system/64/gcc.xml (modified) (1 diff)
• final-system/common/gcc.xml (modified) (1 diff)
• final-system/mips64-64/gcc.xml (modified) (1 diff)
• final-system/mips64/gcc.xml (modified) (1 diff)
• final-system/multilib/gcc.xml (modified) (1 diff)
• final-system/ppc64/gcc.xml (modified) (1 diff)
• final-system/sparc/gcc.xml (modified) (1 diff)
• final-system/sparc64-64/gcc.xml (modified) (1 diff)
• final-system/sparc64/gcc.xml (modified) (1 diff)
• general.ent (modified) (2 diffs)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)
• temp-system/alpha/gcc.xml (modified) (1 diff)
• temp-system/mips/gcc.xml (modified) (1 diff)
• temp-system/mips64-64/gcc.xml (modified) (1 diff)
• temp-system/mips64/gcc.xml (modified) (1 diff)
• temp-system/ppc/gcc.xml (modified) (1 diff)
• temp-system/ppc64/gcc.xml (modified) (1 diff)
• temp-system/sparc/gcc.xml (modified) (1 diff)
• temp-system/sparc64-64/gcc.xml (modified) (1 diff)
• temp-system/sparc64/gcc.xml (modified) (1 diff)
• temp-system/x86/gcc.xml (modified) (1 diff)
• temp-system/x86_64-64/gcc.xml (modified) (1 diff)
• temp-system/x86_64/gcc.xml (modified) (1 diff)

BOOK/cross-tools/alpha/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/mips/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/mips64-64/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/mips64/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/ppc/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/ppc64/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/sparc/gcc-final.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/sparc64-64/gcc-final.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/sparc64/gcc-final.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/x86/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/x86_64-64/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/cross-tools/x86_64/gcc-final.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/64/gcc.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="p5">Apply the following patch to so that linking to /lib64 is now set
+    <para os="p3">Apply the following patch to so that linking to /lib64 is now set
     to /lib.</para>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/common/gcc.xml

@@ -26 +26 @@
     <title>Installation of GCC</title>
 
-    <para os="p1">The following patch fixes an issue where gcc doesn't generate
-    some code properly:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-PR26763-patch;</userinput></screen>
-
-    <para os="p3">The following patch fixes the searching of multilib dirs for
+    <para os="p1">The following patch fixes the searching of multilib dirs for
     specs file:</para>
 
-<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the

BOOK/final-system/mips64-64/gcc.xml

@@ -29 +29 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/mips64/gcc.xml

@@ -29 +29 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/multilib/gcc.xml

@@ -29 +29 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/ppc64/gcc.xml

@@ -29 +29 @@
     href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para>GCC includes a <filename class="directory">nof</filename> directory

BOOK/final-system/sparc/gcc.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='p2'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="p5">The following patches fixes an TLS build issue. For More details
+    <para os="sp1">The following patches fixes an TLS build issue. For More details
 go to <ulink url="http://gcc.gnu.org/ml/gcc-patches/2006-02/msg00177.html"/>:</para>
 
-<screen os="p6"><userinput>patch -Np1 -i ../&gcc-sparc_tls-patch;</userinput></screen>
+<screen os="sp2"><userinput>patch -Np1 -i ../&gcc-sparc_tls-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/sparc64-64/gcc.xml

@@ -31 +31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
+    href="../sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/gcc.xml"
     xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
+    href="../64/gcc.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/final-system/sparc64/gcc.xml

@@ -31 +31 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY version "SVN-20060522">
+<!ENTITY version "SVN-20060525">
 <!ENTITY version-x86 "&version;-x86">
 <!ENTITY version-x86_64 "&version;-x86_64-Multilib">
@@ -16 +16 @@
 <!ENTITY version-alpha "&version;-ALPHA">
 
-<!ENTITY releasedate "May 22, 2006">
+<!ENTITY releasedate "May 25, 2006">
 <!ENTITY milestone "0.1">
 <!ENTITY generic-version "svn"> <!-- Use "svn", "testing", or "x.y[-pre{x}]" -->

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>May 25, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jim] - Updated to GCC 4.1.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>May 22, 2006</para>
       <itemizedlist>

BOOK/materials/common/patches.xml

@@ -110 +110 @@
 
     <varlistentry>
-      <term>GCC PR26763 Patch - <token>&gcc-PR26763-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;gcc/&gcc-PR26763-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-PR26763-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
       <listitem>

BOOK/packages.ent

@@ -146 +146 @@
 <!ENTITY gawk-home "&gnu-software;gawk/">
 
-<!ENTITY gcc-version "4.1.0">
-<!ENTITY gcc-size "37,734 KB">
+<!ENTITY gcc-version "4.1.1">
+<!ENTITY gcc-size "38,300 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "88785071f29ed0e0b6b61057a1079442">
+<!ENTITY gcc-md5 "ad9f97a4d04982ccf4fd67cb464879f3">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 

BOOK/patches.ent

@@ -42 +42 @@
 
 <!ENTITY gcc-PR20425-patch "gcc-&gcc-version;-PR20425-1.patch">
-<!ENTITY gcc-PR20425-patch-md5 "5df80821f6b4ee951aa8cacbef5a67ac">
-<!ENTITY gcc-PR20425-patch-size "37 KB">
-
-<!ENTITY gcc-PR26763-patch "gcc-&gcc-version;-PR26763-1.patch">
-<!ENTITY gcc-PR26763-patch-md5 "289a91a2208ace86401371419d855f4e">
-<!ENTITY gcc-PR26763-patch-size "2 KB">
+<!ENTITY gcc-PR20425-patch-md5 "95535bda8e4d37d30251db0b121b5374">
+<!ENTITY gcc-PR20425-patch-size "36 KB">
 
 <!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">

BOOK/temp-system/alpha/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/mips/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/mips64-64/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/mips64/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/ppc/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/ppc64/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/sparc/gcc.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/sparc64-64/gcc.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/sparc64/gcc.xml

@@ -32 +32 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
+    href="../../final-system/sparc/gcc.xml"
+    xpointer="xpointer(//*[@os='sp1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
+    xpointer="xpointer(//*[@os='sp2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/x86/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/x86_64-64/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"

BOOK/temp-system/x86_64/gcc.xml

@@ -30 +30 @@
     href="../../final-system/common/gcc.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"