Index: BOOK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision ed8de1a8047f69554e3d0a51f41bbf3d9781d622)
+++ BOOK/final-system/sparc64/glibc-64bit.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -50,8 +50,11 @@
     xpointer="xpointer(//*[@os='f'])"/>
 
-    <para>Now we make sure the Glibc goes into
-    <filename class="directory">/lib64</filename>:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m1'])"/>
 
-<screen><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='m2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -59,22 +62,11 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
-    <variablelist>
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -94,37 +86,15 @@
     xpointer="xpointer(//*[@os='m'])"/>
 
-<!-- items n,o,p here are now the master, not multilib, because
- the tests are known to all pass on multilib_64 -->
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
 
-<screen os="n"><userinput>make check</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
 
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. In general, the Glibc test
-    suite is always expected to pass. However, in certain circumstances,
-    some failures are unavoidable. This is a list of the most common
-    issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>The <emphasis>gettext</emphasis> test sometimes fails due to
-        host system issues. The exact reasons are not yet clear.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the LFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        LFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc-64bit.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -146,46 +116,7 @@
   xpointer="xpointer(id('conf-glibc'))"/>
 
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib32</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    <filename class="directory">/opt/lib32</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib32
-/usr/local/lib64
-/opt/lib
-/opt/lib32
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../multilib/glibc-64bit.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision ed8de1a8047f69554e3d0a51f41bbf3d9781d622)
+++ BOOK/final-system/sparc64/glibc.xml	(revision d3a4fc02291a337dfd6dfe454dd7a85df258fc67)
@@ -59,11 +59,10 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-<screen><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${LFS_TARGET32}</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/glibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
+    href="../multilib/glibc.xml"
     xpointer="xpointer(//*[@os='i'])"/>
 
