Index: BOOK/cross-tools/mips64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/cross-tools/mips64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -91,4 +91,12 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='do'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='dp'])"/>
+
   </sect2>
 
Index: BOOK/cross-tools/ppc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/cross-tools/ppc64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -133,9 +133,9 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64-64/eglibc.xml"
+    href="../x86_64-64/eglibc.xml"
     xpointer="xpointer(//*[@os='do'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../sparc64-64/eglibc.xml"
+    href="../x86_64-64/eglibc.xml"
     xpointer="xpointer(//*[@os='dp'])"/>
 
Index: BOOK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/cross-tools/x86_64-64-chapter.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="64/gcc-final.xml"/>
 
Index: BOOK/cross-tools/x86_64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
+++ BOOK/cross-tools/x86_64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+]>
+
+<sect1 id="ch-cross-tools-eglibc" role="wrap">
+  <?dbhtml filename="eglibc.html"?>
+
+  <title>EGLIBC-&eglibc-version; 32 Bit</title>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGLIBC">EGLIBC</primary>
+    <secondary>cross tools, 32 Bit</secondary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+  href="../../final-system/common/eglibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of EGLIBC</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dd'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='de'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET32) -O2" \
+    ../eglibc-&eglibc-version;/configure --prefix=/tools \
+    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
+    --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
+    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
+
+    <variablelist os="dg">
+      <title>The meaning of the new configure options:</title>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg1'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../multilib/eglibc.xml"
+      xpointer="xpointer(//*[@os='ea1'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg3'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg4'])"/>
+
+     <varlistentry os="ea2">
+        <term><parameter>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt;
+        $CLFS_TARGET32) -O2"</parameter></term>
+        <listitem>
+          <para>Forces EGLIBC to optimize for our target system.</para>
+        </listitem>
+      </varlistentry>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg5'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg6'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg7'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg8'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg9'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg10'])"/>
+
+      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../common/eglibc.xml"
+      xpointer="xpointer(//*[@os='dg11'])"/>
+
+    </variablelist>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dh'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='di'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dj'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dk'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dl'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dm'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='dn'])"/>
+
+    <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
+    and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
+    this with the following:</para>
+
+    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title/>
+
+    <para>Details on this package are located in <xref
+    linkend="contents-eglibc" role="."/></para>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/cross-tools/x86_64-chapter.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -28,5 +28,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64/eglibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="x86_64-64/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/eglibc-64bit.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="multilib/gcc-final.xml"/>
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -132,4 +132,12 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
+
   </sect2>
 
Index: BOOK/final-system/ppc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/final-system/ppc64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -141,10 +141,11 @@
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
 
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
 
-    <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
-    and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
 
   </sect2>
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -127,9 +127,11 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
-    and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
-    this with the following:</para>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='u'])"/>
 
-    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../x86_64-64/eglibc.xml"
+    xpointer="xpointer(//*[@os='v'])"/>
 
   </sect2>
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 69cbad1595654667c187826c4778a6cc338823ad)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision 64e30c844fa45baf8e4286f5e5b2757a0f85e4d3)
@@ -148,4 +148,10 @@
 
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
+
+ <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
+    and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
+    this with the following:</para>
+
+    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
 
   </sect2>
