Index: BOOK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/alpha/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/common/util-linux.xml
===================================================================
--- BOOK/boot/common/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/common/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -38,12 +38,4 @@
     href="../../final-system/common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <para os="ba">Util-linux does not use the freshly installed headers and
Index: BOOK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/mips/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -34,12 +34,4 @@
     href="../../bootable/mips/kernel.xml"
     xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/mips64/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/mips64/util-linux.xml
===================================================================
--- BOOK/boot/mips64/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/mips64/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -40,18 +40,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
+    href="../../final-system/mips64/util-linux.xml"
     xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
+    href="../../final-system/mips64/util-linux.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='p7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='p8'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/multilib/util-linux.xml
===================================================================
--- BOOK/boot/multilib/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/multilib/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -38,12 +38,4 @@
     href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/ppc/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/ppc64/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/sparc/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/sparc64/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/x86/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -32,12 +32,4 @@
       use the resulting kernel image for production systems.</para>
     </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/boot/x86_64/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -26,12 +26,4 @@
     href="../x86/kernel.xml"
     xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/alpha/kernel.xml
===================================================================
--- BOOK/bootable/alpha/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/alpha/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/mips/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -30,12 +30,4 @@
 
 <screen os="bb"><userinput>patch -Np1 -i ../&linux-mips-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/ppc/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/sparc/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/x86/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -31,9 +31,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <para os="p1">Util-linux does not compute the checksum of a sun disklabel
-    properly with gcc-&gcc-version;. The following patch fixes this issue:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&linux-sun_disklabel_fix-patch;</userinput></screen>
 
     <para os="a">Building the kernel involves a few steps&mdash;configuration,
Index: BOOK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/bootable/x86_64/kernel.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,12 +21,4 @@
   <sect2 role="installation">
     <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/alpha/gcc-final.xml
===================================================================
--- BOOK/cross-tools/alpha/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/alpha/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    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='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/mips/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/mips64-64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/mips64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/ppc/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/ppc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/ppc64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/sparc/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/sparc64-64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/sparc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/sparc64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/cross-tools/x86_64/gcc-final.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC Cross Compiler</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,8 +22,16 @@
     <title>Installation of GCC</title>
 
-    <para os="p1">Apply the following patch to so that linking to /lib64 is now set
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <para os="p3">Apply the following patch to so that linking to /lib64 is now set
     to /lib.</para>
 
-<screen os="p2"><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"
Index: BOOK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/common/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -34,4 +34,9 @@
   <sect2 role="installation">
     <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-fold_const-patch;</userinput></screen>
 
     <para os="d">Apply a <command>sed</command> substitution that will suppress the
Index: BOOK/final-system/common/util-linux.xml
===================================================================
--- BOOK/final-system/common/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/common/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -60,9 +60,4 @@
 
 <screen os="p4"><userinput>patch -Np1 -i ../&util-linux-gcc4_fixes-patch;</userinput></screen>
-
-    <para os="p5">Util-linux does not compute the checksum of a sun disklabel
-    properly with gcc-&gcc-version;. The following patch fixes this issue:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-gcc41_sun_disklabel_fixes-patch;</userinput></screen>
 
     <para os="a">Prepare Util-linux for compilation:</para>
Index: BOOK/final-system/mips/gcc.xml
===================================================================
--- BOOK/final-system/mips/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/mips/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/mips64-64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -23,10 +23,18 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
+    href="../common/gcc.xml"
     xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../64/gcc.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/mips64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/util-linux.xml
===================================================================
--- BOOK/final-system/mips64/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/mips64/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -42,16 +42,8 @@
     xpointer="xpointer(//*[@os='p4'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <para os="p7">Util-linux has a compilation error when built using 64bit
+    <para os="p5">Util-linux has a compilation error when built using 64bit
     and a MIPS processor. The follow patch addresses this error:</para>
 
-<screen os="p8"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
+<screen os="p6"><userinput>patch -Np1 -i ../&util-linux-mips64-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/multilib/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -21,4 +21,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/util-linux.xml
===================================================================
--- BOOK/final-system/multilib/util-linux.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/final-system/multilib/util-linux.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -44,12 +44,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/introduction/common/changelog.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -38,4 +38,16 @@
 
     <listitem>
+      <para>Date</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Added a gcc patch that fixes an optimaztion error which can result in incorrect code.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Removed the util-linux and kernel patch that fixes the checksum calculation for sun disklabels.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>April 17, 2006</para>
       <itemizedlist>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/materials/common/patches.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -92,4 +92,12 @@
 
     <varlistentry>
+      <term>GCC Fold Const Patch - 3.1 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;gcc/&gcc-fold_const-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>GCC Posix Patch - 9 KB:</term>
       <listitem>
@@ -144,12 +152,4 @@
         <para><ulink
         url="&patches-root;kbd/&kbd-gcc4_fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux Sun Disklabel Patch - 1 KB:</term>
-      <listitem>
-        <para><ulink
-        url="&patches-root;linux/&linux-sun_disklabel_fix-patch;"/></para>
       </listitem>
     </varlistentry>
@@ -221,11 +221,4 @@
         <para><ulink
         url="&patches-root;util-linux/&util-linux-gcc4_fixes-patch;"/></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-Linux Sun Disklabel Patch - 1 KB:</term> <listitem>
-        <para><ulink
-        url="&patches-root;util-linux/&util-linux-gcc41_sun_disklabel_fixes-patch;"/></para>
       </listitem>
     </varlistentry>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/patches.ent	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -17,4 +17,5 @@
 
 <!ENTITY gcc-cross_search-patch "gcc-&gcc-version;-cross_search_paths-1.patch">
+<!ENTITY gcc-fold_const-patch "gcc-&gcc-version;-fold_const_fix-1.patch">
 <!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
 <!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
@@ -31,6 +32,4 @@
 
 <!ENTITY kbd-gcc4_fixes-patch "kbd-&kbd-version;-gcc4_fixes-1.patch">
-
-<!ENTITY linux-sun_disklabel_fix-patch "linux-&linux-version;-sun_disklabel_fix-1.patch">
 
 <!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
@@ -52,5 +51,4 @@
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 <!ENTITY util-linux-gcc4_fixes-patch "util-linux-&util-linux-version;-gcc4_fixes-1.patch">
-<!ENTITY util-linux-gcc41_sun_disklabel_fixes-patch "util-linux-&util-linux-version;-gcc41_sun_disklabel_fixes-1.patch">
 
 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
Index: BOOK/temp-system/alpha/gcc.xml
===================================================================
--- BOOK/temp-system/alpha/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/alpha/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips/gcc.xml
===================================================================
--- BOOK/temp-system/mips/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/mips/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/mips64-64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/mips64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/ppc/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/ppc64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/ppc64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc/gcc.xml
===================================================================
--- BOOK/temp-system/sparc/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/sparc/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64-64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/sparc64-64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/sparc64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/sparc64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/temp-system/x86/gcc.xml
===================================================================
--- BOOK/temp-system/x86/gcc.xml	(revision 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/x86/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/x86_64-64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <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 966f7254b75159a3aa4ae2c7356990042de48b93)
+++ BOOK/temp-system/x86_64/gcc.xml	(revision 79ccd95128f2a898f4a3f548f6ce3694174b5f5f)
@@ -22,4 +22,12 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../../final-system/common/gcc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
