Index: cross-tools/alpha/gcc-final.xml
===================================================================
--- cross-tools/alpha/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/alpha/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/mips/gcc-final.xml
===================================================================
--- cross-tools/mips/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/mips/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/mips64-64/gcc-final.xml
===================================================================
--- cross-tools/mips64-64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/mips64-64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/mips64/gcc-final.xml
===================================================================
--- cross-tools/mips64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/mips64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/ppc/gcc-final.xml
===================================================================
--- cross-tools/ppc/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/ppc/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/ppc64/gcc-final.xml
===================================================================
--- cross-tools/ppc64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/ppc64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/sparc/gcc-final.xml
===================================================================
--- cross-tools/sparc/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/sparc/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- cross-tools/sparc64-64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/sparc64-64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/sparc64/gcc-final.xml
===================================================================
--- cross-tools/sparc64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/sparc64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/x86/gcc-final.xml
===================================================================
--- cross-tools/x86/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/x86/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- cross-tools/x86_64-64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/x86_64-64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: cross-tools/x86_64/gcc-final.xml
===================================================================
--- cross-tools/x86_64/gcc-final.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ cross-tools/x86_64/gcc-final.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: final-system/64/gcc.xml
===================================================================
--- final-system/64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -29,4 +29,12 @@
     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 os="p3">Apply the following patch to so that linking to /lib64 is now set
Index: final-system/common/gcc.xml
===================================================================
--- final-system/common/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/common/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -39,4 +39,9 @@
 
 <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
+    specs file:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR20425-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the
Index: final-system/mips/gcc.xml
===================================================================
--- final-system/mips/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/mips/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -29,4 +29,12 @@
     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"
Index: final-system/mips64-64/gcc.xml
===================================================================
--- final-system/mips64-64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/mips64-64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -29,4 +29,12 @@
     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"
Index: final-system/mips64/gcc.xml
===================================================================
--- final-system/mips64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/mips64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -29,4 +29,12 @@
     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"
Index: final-system/multilib/gcc.xml
===================================================================
--- final-system/multilib/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ final-system/multilib/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -29,4 +29,12 @@
     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"
Index: introduction/common/changelog.xml
===================================================================
--- introduction/common/changelog.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ introduction/common/changelog.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -43,4 +43,8 @@
           <para>[jim] - Renamed gcc fold_const patch to the PR #.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Added GCC 4.1.0 patch PR20425. This allows searching of
+	   multilib dirs for the specs file.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
Index: materials/common/patches.xml
===================================================================
--- materials/common/patches.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ materials/common/patches.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -92,8 +92,16 @@
 
     <varlistentry>
-      <term>GCC Fold Const Patch - 3.1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;gcc/&gcc-fold_const-patch;"/></para>
+      <term>GCC PR20425 Patch - 37 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-PR20425-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>GCC PR26763 Patch - 3.1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-PR26763-patch;"/></para>
       </listitem>
     </varlistentry>
Index: patches.ent
===================================================================
--- patches.ent	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ patches.ent	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -17,4 +17,5 @@
 
 <!ENTITY gcc-cross_search-patch "gcc-&gcc-version;-cross_search_paths-1.patch">
+<!ENTITY gcc-PR20425-patch "gcc-&gcc-version;-PR20425-1.patch">
 <!ENTITY gcc-PR26763-patch "gcc-&gcc-version;-PR26763-1.patch">
 <!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
Index: temp-system/alpha/gcc.xml
===================================================================
--- temp-system/alpha/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/alpha/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/mips/gcc.xml
===================================================================
--- temp-system/mips/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/mips/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/mips64-64/gcc.xml
===================================================================
--- temp-system/mips64-64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/mips64-64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/mips64/gcc.xml
===================================================================
--- temp-system/mips64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/mips64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/ppc/gcc.xml
===================================================================
--- temp-system/ppc/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/ppc/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/ppc64/gcc.xml
===================================================================
--- temp-system/ppc64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/ppc64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/sparc/gcc.xml
===================================================================
--- temp-system/sparc/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/sparc/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/sparc64-64/gcc.xml
===================================================================
--- temp-system/sparc64-64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/sparc64-64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/sparc64/gcc.xml
===================================================================
--- temp-system/sparc64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/sparc64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/x86/gcc.xml
===================================================================
--- temp-system/x86/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/x86/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/x86_64-64/gcc.xml
===================================================================
--- temp-system/x86_64-64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/x86_64-64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
Index: temp-system/x86_64/gcc.xml
===================================================================
--- temp-system/x86_64/gcc.xml	(revision 640831c0119e4c5953715321d5f4e97f9b191611)
+++ temp-system/x86_64/gcc.xml	(revision ec33b65f1a5719c27f2b65f326815760d5f9ca61)
@@ -30,4 +30,12 @@
     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"
