Index: BOOK/cross-tools/x86/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86/gcc-final.xml	(revision 1fd00ea526405bcdaf184f214949ab8c7ee5eea5)
+++ BOOK/cross-tools/x86/gcc-final.xml	(revision 7afc252c7e59416c1358883bce811fe7c44b426c)
@@ -5,4 +5,6 @@
   %general-entities;
 ]>
+
+<!-- x86 GCC-Final -->
 
 <sect1 id="ch-cross-tools-gcc-final" role="wrap">
@@ -17,5 +19,5 @@
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc-static.xml"
+  href="../common/gcc-final.xml"
   xpointer="xpointer(//*[@role='package'])"/>
 
@@ -24,13 +26,13 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='d'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -71,101 +73,24 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>make</userinput></screen>
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='ah'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
+    href="../common/gcc-final.xml"
     xpointer="xpointer(//*[@os='ai'])"/>
 
-<screen os="aj"><userinput>make install</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='aj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@os='ak'])"/>
 
   </sect2>
 
-  <sect2 id="contents-gcc" role="content">
-    <title>Contents of GCC</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>cc (link to gcc), gcc, gccbug, and gcov</seg>
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libmudflap.[a,so],
-        and libmudflapth.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cc">
-        <term><command>cc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-cross-tools-gcc-final cc">
-            <primary sortas="b-cc">cc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcc">
-        <term><command>gcc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-cross-tools-gcc-final gcc">
-            <primary sortas="b-gcc">gcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gccbug">
-        <term><command>gccbug</command></term>
-        <listitem>
-          <para>A shell script used to help create useful bug reports</para>
-          <indexterm zone="ch-cross-tools-gcc-final gccbug">
-            <primary sortas="b-gccbug">gccbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcov">
-        <term><command>gcov</command></term>
-        <listitem>
-          <para>A coverage testing tool; it is used to analyze programs to
-          determine where optimizations will have the most effect</para>
-          <indexterm zone="ch-cross-tools-gcc-final gcov">
-            <primary sortas="b-gcov">gcov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcc">
-        <term><filename class="libraryfile">libgcc</filename></term>
-        <listitem>
-          <para>Contains run-time support for <command>gcc</command></para>
-          <indexterm zone="ch-cross-tools-gcc-final libgcc">
-            <primary sortas="c-libgcc*">libgcc*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmudflap">
-        <term><filename class="libraryfile">libmudflap</filename></term>
-        <listitem>
-          <para>The libmudflap libraries are used by GCC for instrumenting
-          pointer and array dereferencing operations.</para>
-          <indexterm zone="ch-cross-tools-gcc-final libmudflap">
-            <primary sortas="c-libmudflap*">libmudflap*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/gcc-final.xml"
+    xpointer="xpointer(//*[@role='content'])"/>
 
 </sect1>
