Index: cross-tools/64/flags.xml
===================================================================
--- cross-tools/64/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
+++ cross-tools/64/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para os="a">We will need to setup target specific flags for the compiler
+  and linkers.</para>
+
+<screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
+
+  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
+  prevent issues if we stop and come back later.</para>
+
+<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+
+</sect1>
Index: cross-tools/mips64-64/flags.xml
===================================================================
--- cross-tools/mips64-64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/mips64-64/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -12,5 +12,5 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64-64/flags.xml"
+   href="../64/flags.xml"
    xpointer="xpointer(//*[@os='a'])"/>
 
@@ -18,9 +18,9 @@
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64-64/flags.xml"
+   href="../64/flags.xml"
    xpointer="xpointer(//*[@os='c'])"/>
 
    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64-64/flags.xml"
+   href="../64/flags.xml"
    xpointer="xpointer(//*[@os='d'])"/>
 
Index: cross-tools/mips64/flags.xml
===================================================================
--- cross-tools/mips64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/mips64/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -12,5 +12,5 @@
 
      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
+     href="../multilib/flags.xml"
      xpointer="xpointer(//*[@os='a'])"/>
 
@@ -20,5 +20,5 @@
 
      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../x86_64/flags.xml"
+     href="../multilib/flags.xml"
      xpointer="xpointer(//*[@os='c'])"/>
 
Index: cross-tools/multilib/flags.xml
===================================================================
--- cross-tools/multilib/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
+++ cross-tools/multilib/flags.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-flags">
+  <?dbhtml filename="flags.html"?>
+
+  <title>Build Flags</title>
+
+  <para os="a">We will need to setup target specific flags for the compiler
+  and linkers.</para>
+
+<screen os="b"><userinput>export BUILD32="-m32"
+export BUILD64="-m64"</userinput></screen>
+
+  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
+  prevent issues if we stop and come back later.</para>
+
+<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
+echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
+
+</sect1>
Index: cross-tools/ppc64-chapter.xml
===================================================================
--- cross-tools/ppc64-chapter.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/ppc64-chapter.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
Index: oss-tools/ppc64/flags.xml
===================================================================
--- cross-tools/ppc64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
-
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: cross-tools/sparc64-64-chapter.xml
===================================================================
--- cross-tools/sparc64-64-chapter.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/sparc64-64-chapter.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/binutils.xml"/>
Index: oss-tools/sparc64-64/flags.xml
===================================================================
--- cross-tools/sparc64-64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64-64/flags.xml"
-   xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64-64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-  <para os="e">The following table gives the entires for different Sparc 64 capable
-  processors. Pick the processor that matches your system.</para>
-
-  <table os="f">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Build64"/>
-      <colspec colname="GCC"/>
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-</sect1>
-
Index: cross-tools/sparc64-chapter.xml
===================================================================
--- cross-tools/sparc64-chapter.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/sparc64-chapter.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/binutils.xml"/>
Index: oss-tools/sparc64/flags.xml
===================================================================
--- cross-tools/sparc64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD32 and BUILD64
-  from the table at the bottom of the page.</para>
-
-<screen os="b"><userinput>export BUILD32="[BUILD32 entries]"
-export BUILD64="[BUILD64 entries]"
-export GCCTARGET="[GCCTARGET entries]"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../x86_64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="f"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-  <para os="d">The following table gives the entires for different Sparc 64 capable
-  processors. Pick the processor that matches your system.</para>
-
-  <table os="e">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <tgroup cols="2" align="center">
-      <colspec colname="Processor"/>
-      <colspec colname="Build32"/>
-      <colspec colname="Build64"/>
-      <colspec colname="GCC"/>
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD32</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-    </tgroup>
-  </table>
-
-</sect1>
-
Index: cross-tools/x86_64-64-chapter.xml
===================================================================
--- cross-tools/x86_64-64-chapter.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/x86_64-64-chapter.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -14,5 +14,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/variables.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/linux-libc-headers.xml"/>
Index: oss-tools/x86_64-64/flags.xml
===================================================================
--- cross-tools/x86_64-64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
-
-<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: cross-tools/x86_64-chapter.xml
===================================================================
--- cross-tools/x86_64-chapter.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ cross-tools/x86_64-chapter.xml	(revision b6c2a188c6e208f96135d47d26e9653e0b2bb4d7)
@@ -15,5 +15,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-libc-headers.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
Index: oss-tools/x86_64/flags.xml
===================================================================
--- cross-tools/x86_64/flags.xml	(revision 5a6d76a8e27b2fac31b1abf0f02b55c52b7fe834)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
-
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
