Index: BOOK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/appendices/dependencies/common.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -95,5 +95,5 @@
 
         <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make,
+          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, Make,
           Ncurses, Patch, Readline, Sed and Texinfo</seg>
         </seglistitem>
@@ -123,5 +123,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Glibc,
+         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, EGlibc, GCC,
          Grep, Make, Perl, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -151,5 +151,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC,
          Grep, M4, Make and Sed</seg>
         </seglistitem>
@@ -179,5 +179,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -233,5 +233,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, GMP, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, GMP, Grep, Make,
          Patch, Perl, Sed and Texinfo</seg>
         </seglistitem>
@@ -315,5 +315,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -343,5 +343,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, GCC, Grep, Make,
          Patch, Sed and Tcl</seg>
         </seglistitem>
@@ -371,5 +371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
+         <seg>Bash, Binutils, Coreutils, EGlibc, Gawk, GCC, Gettext, Grep, Gzip,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -399,5 +399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
          Make, Sed and Zlib</seg>
         </seglistitem>
@@ -427,5 +427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -455,5 +455,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -483,5 +483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -510,6 +510,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         GCC, GMP, Grep, Make, MPFR, Patch, Perl, Sed, Tar and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -538,6 +538,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, Grep, Make, Sed and Texinfo</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         GCC, Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
       </segmentedlist>
@@ -559,6 +559,6 @@
       </segmentedlist>
 
-<!-- Begin Glibc dependency info -->
-  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
+<!-- Begin EGlibc dependency info -->
+  <bridgehead renderas="sect2" id="eglibc-dep">EGlibc</bridgehead>
 
       <segmentedlist>
@@ -594,5 +594,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, M4, Make,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, M4, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -622,5 +622,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
          Make, Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -650,5 +650,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Perl
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make, Perl
          Sed and Texinfo</seg>
         </seglistitem>
@@ -678,5 +678,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -733,5 +733,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, GCC, Glibc,
+         <seg>Bash, Binutils, Bison, Coreutils, Findutils, Flex, EGlibc, GCC,
          Make, Linux-Headers and Sed</seg>
         </seglistitem>
@@ -761,5 +761,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc and Make</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC and Make</seg>
         </seglistitem>
       </segmentedlist>
@@ -788,5 +788,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Gzip, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Gzip, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -815,5 +815,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -843,5 +843,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, EGlibc, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -898,5 +898,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, EGlibc, GCC, Grep,
          Gzip, Make, Module-Init-Tools, Ncurses, Perl and Sed</seg>
         </seglistitem>
@@ -926,5 +926,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make, Sed
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make, Sed
          and Texinfo</seg>
         </seglistitem>
@@ -954,5 +954,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -982,6 +982,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Gawk, GCC,
-         Glibc, Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
+         <seg>Bash, Binutils, Bzip2, Coreutils, EGlibc, Gawk, GCC,
+         Grep, Groff, Gzip, Less, XZ-Utils, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1037,5 +1037,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, GMP,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, GMP,
          Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1065,5 +1065,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Findutils, EGlibc, GCC, Grep, Make,
          Sed and Zlib</seg>
         </seglistitem>
@@ -1093,5 +1093,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1122,5 +1122,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1149,5 +1149,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1177,5 +1177,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Ncurses</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make and Ncurses</seg>
         </seglistitem>
       </segmentedlist>
@@ -1204,5 +1204,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Ncurses
          and Sed</seg>
         </seglistitem>
@@ -1232,5 +1232,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make, Ncurses,
          Patch, Sed and Texinfo</seg>
         </seglistitem>
@@ -1260,5 +1260,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make
+         <seg>Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep, Make
          and Sed</seg>
         </seglistitem>
@@ -1288,5 +1288,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Grep, Make,
          Sed and Texinfo</seg>
         </seglistitem>
@@ -1316,6 +1316,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         GCC, Gettext, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1344,5 +1344,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Binutils, Coreutils, EGlibc, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1371,5 +1371,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GCC, Glibc,
+         <seg>Bash, Binutils, Bison, Coreutils, EGlibc, GCC,
          Grep, Make, Sed and Texinfo</seg>
         </seglistitem>
@@ -1399,5 +1399,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1427,5 +1427,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
+         <seg>Bash, Binutils, Coreutils, Gawk, EGlibc, GCC, Grep, Make,
          Ncurses and Sed</seg>
         </seglistitem>
@@ -1455,5 +1455,5 @@
 
         <seglistitem>
-         <seg>Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
+         <seg>Binutils, Coreutils, Diffutils, Gawk, EGlibc, GCC, Grep,
          Make and Sed</seg>
         </seglistitem>
@@ -1483,5 +1483,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Glibc, Grep,
+         <seg>Bash, Binutils, Coreutils, E2fprogs, EGlibc, GCC, Grep,
          Make, Ncurses, Sed, Texinfo and Zlib</seg>
         </seglistitem>
@@ -1511,6 +1511,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Gettext, Glibc, Grep, Make, Ncurses, Perl and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         GCC, Gettext, Grep, Make, Ncurses, Perl and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1539,6 +1539,6 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-         Glibc, Grep, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, Diffutils, EGlibc, Findutils, Gawk,
+         GCC, Grep, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
@@ -1567,5 +1567,5 @@
 
         <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
+         <seg>Bash, Binutils, Coreutils, EGlibc, GCC, Make and Sed</seg>
         </seglistitem>
       </segmentedlist>
Index: BOOK/bootable/arm/kernel.xml
===================================================================
--- BOOK/bootable/arm/kernel.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/bootable/arm/kernel.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -124,5 +124,5 @@
       <para>Also, the headers in the system's <filename
       class="directory">include</filename> directory should
-      <emphasis>always</emphasis> be the ones against which Glibc was
+      <emphasis>always</emphasis> be the ones against which EGlibc was
       compiled (from the Linux-Headers package) and should
       <emphasis>never</emphasis> be replaced by the kernel headers.</para>
Index: BOOK/bootscripts/common/locale.xml
===================================================================
--- BOOK/bootscripts/common/locale.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/bootscripts/common/locale.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -50,5 +50,5 @@
   canonical charmap for your chosen locale.</para>
 
-  <para>The list of all locales supported by Glibc can be obtained by running
+  <para>The list of all locales supported by EGlibc can be obtained by running
   the following command:</para>
 
@@ -85,5 +85,5 @@
   commands above fail with a message similar to the one shown below, this means
   that your locale was either not installed in Chapter 10 or is not supported by
-  the default installation of Glibc.</para>
+  the default installation of EGlibc.</para>
 
 <screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
@@ -92,5 +92,5 @@
   the <command>localedef</command> command, or consider choosing a different
   locale. Further instructions assume that there are no such error messages
-  from Glibc.</para>
+  from EGlibc.</para>
 
   <para>Some packages beyond CLFS may also lack support for your chosen locale.
@@ -102,5 +102,5 @@
   <para>Sometimes it is possible to fix this by removing the charmap part of
   the locale specification, as long as that does not change the character map
-  that Glibc associates with the locale (this can be checked by running the
+  that EGlibc associates with the locale (this can be checked by running the
   <command>locale charmap</command> command in both locales). For example,
   one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
Index: BOOK/cross-tools/alpha-chapter.xml
===================================================================
--- BOOK/cross-tools/alpha-chapter.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/alpha-chapter.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,126 @@
+<?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">
+  <title>EGlibc-&eglibc-version;</title>
+
+  <?dbhtml filename="eglibc.html"?>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGlibc">EGlibc</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of EGlibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('i18n-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('contents-eglibc'))"/>
+
+</sect1>
Index: OK/cross-tools/alpha/glibc.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?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-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: BOOK/cross-tools/arm-chapter.xml
===================================================================
--- BOOK/cross-tools/arm-chapter.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/arm-chapter.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
Index: BOOK/cross-tools/arm/eglibc.xml
===================================================================
--- BOOK/cross-tools/arm/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ BOOK/cross-tools/arm/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,134 @@
+<?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">
+  <title>EGlibc-&eglibc-version;</title>
+
+  <?dbhtml filename="eglibc.html"?>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGlibc">EGlibc</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of EGlibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <para os="u1">This architecture is no longer supported in the main eglibc
+    tree, so we have to extract the eglibc-ports-&eglibc-version; package into
+    our eglibc-&eglibc-version; directory. Then we move ports to the location
+    expected by our build and patches:</para>
+
+<screen os="u2"><userinput>tar -jxvf ../eglibc-ports-&eglibc-ports-version;.tar.bz2
+mv -v eglibc-ports-&eglibc-version; ports</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='i'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('i18n-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('contents-eglibc'))"/>
+
+</sect1>
Index: OK/cross-tools/arm/glibc.xml
===================================================================
--- BOOK/cross-tools/arm/glibc.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?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-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="u1">This architecture is no longer supported in the main glibc
-    tree, so we have to extract the glibc-ports-&glibc-version; package into
-    our glibc-&glibc-version; directory. Then we move ports to the location
-    expected by our build and patches:</para>
-
-<screen os="u2"><userinput>tar -jxvf ../glibc-ports-&glibc-ports-version;.tar.bz2
-mv -v glibc-ports-&glibc-version; ports</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <para os="arp1">The following patch adds a missing hidden alias for
-    __sigsetjmp:</para>
-
-<screen os="arp2"><userinput>patch -Np1 -i ../&glibc-arm_setjmp_fix-patch;</userinput></screen>
-
-    <para os="arp3">The following patch adds a missing include that fixes a
-    compilation error on arm.</para>
-
-<screen os="arp4"><userinput>patch -Np1 -i ../&glibc-nptl_lowlevellock-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: BOOK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/common/binutils.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -24,5 +24,5 @@
 
     <para os="da">It is important that Binutils be the first package compiled
-    because both Glibc and GCC perform various tests on the available
+    because both EGlibc and GCC perform various tests on the available
     linker and assembler to determine which of their own features to
     enable.</para>
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ BOOK/cross-tools/common/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,856 @@
+<?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;</title>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGlibc">EGlibc</primary>
+    <secondary>cross tools</secondary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title/>
+
+    <para>The EGlibc package contains the main C library. This library provides
+    the basic routines for allocating memory, searching directories, opening and
+    closing files, reading and writing files, string handling, pattern matching,
+    arithmetic, and so on.</para>
+
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of EGlibc</title>
+
+    <note os="a">
+      <para>Some packages outside of CLFS suggest installing GNU libiconv in
+      order to translate data from one encoding to another. The project's
+      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
+      <quote>This library provides an <function>iconv()</function>
+      implementation, for use on systems which don't have one, or whose
+      implementation cannot convert from/to Unicode.</quote> EGlibc provides
+      an <function>iconv()</function> implementation and can convert from/to
+      Unicode, therefore libiconv is not required on an CLFS system.</para>
+    </note>
+
+    <para os="p1">EGlibc has various issues addressed by the following patch:</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</userinput></screen>
+
+    <para os="s1">Disable linking to <filename>libgcc_eh</filename>:</para>
+
+<screen os="s2"><userinput>cp -v Makeconfig{,.orig}
+sed -e 's/-lgcc_eh//g' Makeconfig.orig > Makeconfig</userinput></screen>
+
+    <para os="b">The EGlibc documentation recommends building EGlibc outside of the
+    source directory in a dedicated build directory:</para>
+
+<screen os="c"><userinput>mkdir -v ../eglibc-build
+cd ../eglibc-build</userinput></screen>
+
+    <para os="d">The following lines need to be added to
+    <filename>config.cache</filename> for EGlibc to support NPTL:</para>
+
+<screen os="e"><userinput>cat &gt; config.cache &lt;&lt; EOF
+libc_cv_forced_unwind=yes
+libc_cv_c_cleanup=yes
+libc_cv_gnu89_inline=yes
+EOF</userinput></screen>
+
+    <para os="f">The following line needs to be added to
+    <filename>configparms</filename> to adjust installation paths:</para>
+
+<screen os="g"><userinput>cat &gt; configparms &lt;&lt; EOF
+install_root=${CLFS}
+EOF</userinput></screen>
+
+    <para os="h">Prepare EGlibc for compilation:</para>
+
+<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+    ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
+    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
+    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
+
+    <variablelist os="j">
+      <title>The meaning of the new configure options:</title>
+
+      <varlistentry os="j1">
+        <term><parameter>BUILD_CC="gcc"</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to use the compiler on the host system. This is
+          used to create the tools EGlibc uses during its build.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j2">
+        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
+        <listitem>
+          <para>This forces EGlibc to use the GCC compiler that we made for our target
+          architecture.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j3">
+        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
+        <listitem>
+          <para>This forces EGlibc to use the <command>ar</command> utility
+          we made for our target architecture.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j4">
+        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
+        <listitem>
+          <para>This forces EGlibc to use the <command>ranlib</command> utility
+          we made for our target architecture.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j5">
+        <term><parameter>--disable-profile</parameter></term>
+        <listitem>
+          <para>This builds the libraries without profiling information.
+          Omit this option if profiling on the temporary tools is necessary.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j6">
+        <term><parameter>--enable-add-ons</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to utilize all add-ons that are
+          available.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j7">
+        <term><parameter>--with-tls</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to use Thread Local Storage.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j8">
+        <term><parameter>--with-__thread</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to use use the __thread for libc and
+          libpthread builds.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j9">
+        <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to use the Binutils that are specific to
+          our target architecture.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry os="j10">
+        <term><parameter>--cache-file=config.cache</parameter></term>
+        <listitem>
+          <para>This tells EGlibc to utilize a premade cache file.</para>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+    <para os="k">During this stage the following warning might appear:</para>
+
+<blockquote os="l"><screen><computeroutput>configure: WARNING:
+*** These auxiliary programs are missing or
+*** incompatible versions: msgfmt
+*** some features will be disabled.
+*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
+
+    <para os="m">The missing or incompatible <command>msgfmt</command> program is
+    generally harmless. This <command>msgfmt</command> program is part of the
+    Gettext package which the host distribution should provide.</para>
+
+    <para os="n">Compile the package:</para>
+
+<screen os="o"><userinput>make</userinput></screen>
+
+    <para os="p">Install the package:</para>
+
+<screen os="q"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="i18n-eglibc" role="configuration">
+    <title>Internationalization</title>
+
+    <para>The locales that can make the system respond in a different
+    language were not installed by the above command. Install them
+    with:</para>
+
+<screen><userinput>make localedata/install-locales</userinput></screen>
+
+    <para>To save time, an alternative to running the previous command (which
+    generates and installs every locale listed in the
+    eglibc-&eglibc-version;/localedata/SUPPORTED file) is to install only
+    those locales that are wanted and needed. This can be achieved by using
+    the <command>localedef</command> command. Information on this command is
+    located in the <filename>INSTALL</filename> file in the EGlibc source.
+    However, there are a number of locales that are essential in order for the
+    tests of future packages to pass, in particular, the
+    <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
+    instead of the <parameter>install-locales</parameter> target used above,
+    will install the minimum set of locales necessary for the tests to run
+    successfully:</para>
+
+<screen role="nodump"><userinput>mkdir -pv ${CLFS}/usr/lib/locale
+export I18NPATH=${PWD}/localedata
+export GCONV_PATH=${PWD}/iconvdata
+export LOCALEDEF="${PWD}/locale/localedef-native \
+    --alias-file=../intl/locale.alias"
+cd ../eglibc-&eglibc-version;/localedata
+${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE
+${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 \
+    --prefix=${CLFS} de_DE@euro
+${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK
+${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH
+${LOCALEDEF} -i locales/en_US -f charmaps/ISO-8859-1 --prefix=${CLFS} en_US
+${LOCALEDEF} -i locales/es_MX -f charmaps/ISO-8859-1 --prefix=${CLFS} es_MX
+${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR
+${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR
+${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 \
+    --prefix=${CLFS} fr_FR@euro
+${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT
+${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP
+unset I18NPATH GCONV_PATH LOCALEDEF</userinput></screen>
+
+    <para>Some locales installed by the <command>make
+    localedata/install-locales</command> command above are not properly
+    supported by some applications that are in the CLFS and BLFS books. Because
+    of the various problems that arise due to application programmers making
+    assumptions that break in such locales, CLFS should not be used in locales
+    that utilize multibyte character sets (including UTF-8) or right-to-left
+    writing order.  Numerous unofficial and unstable patches are required to
+    fix these problems, and it has been decided by the CLFS developers not to
+    support such complex locales at this time. This applies to the ja_JP and
+    fa_IR locales as well&mdash;they have been installed only for GCC and
+    Gettext tests to pass, and the <command>watch</command> program (part of
+    the Procps package) does not work properly in them. Various attempts to
+    circumvent these restrictions are documented in internationalization-related
+    hints.</para>
+
+  </sect2>
+
+  <sect2 id="conf-eglibc" role="configuration">
+    <title>Configuring EGlibc</title>
+
+    <indexterm zone="conf-eglibc">
+      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
+    </indexterm>
+
+    <indexterm zone="conf-eglibc">
+      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
+    </indexterm>
+
+    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
+    because, although EGlibc provides defaults when this file is missing or
+    corrupt, the EGlibc defaults do not work well in a networked environment.
+    The time zone also needs to be configured.</para>
+
+    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
+    the following:</para>
+
+<screen><userinput>cat &gt; ${CLFS}/etc/nsswitch.conf &lt;&lt; "EOF"
+<literal># Begin /etc/nsswitch.conf
+
+passwd: files
+group: files
+shadow: files
+
+hosts: files dns
+networks: files
+
+protocols: files
+services: files
+ethers: files
+rpc: files
+
+# End /etc/nsswitch.conf</literal>
+EOF</userinput></screen>
+
+    <para>To determine the local time zone, run the following script:</para>
+
+<screen role="nodump"><userinput>TZDIR="${CLFS}/usr/share/zoneinfo" ${CLFS}/usr/bin/tzselect</userinput></screen>
+
+    <para>After answering a few questions about the location, the script will
+    output the name of the time zone (e.g., <emphasis>EST5EDT</emphasis> or
+    <emphasis>Canada/Eastern</emphasis>). Then create the
+    <filename>/etc/localtime</filename> file by running:</para>
+
+<screen><userinput>cp -v --remove-destination ${CLFS}/usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
+    ${CLFS}/etc/localtime</userinput></screen>
+
+    <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
+    that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
+
+    <variablelist>
+      <title>The meaning of the cp option:</title>
+
+      <varlistentry>
+        <term><parameter>--remove-destination</parameter></term>
+        <listitem>
+          <para>This is needed to force removal of the already existing symbolic
+          link. The reason for copying the file instead of using a symlink is to
+          cover the situation where <filename class="directory">/usr</filename>
+          is on a separate partition. This could be important when booted into
+          single user mode.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+
+  </sect2>
+
+  <sect2 id="conf-ld" role="configuration">
+    <title>Configuring The 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. Two directories that are commonly
+    known to contain additional libraries are <filename
+    class="directory">/usr/local/lib</filename> and <filename
+    class="directory">/opt/lib</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; ${CLFS}/etc/ld.so.conf &lt;&lt; "EOF"
+<literal># Begin /etc/ld.so.conf
+
+/usr/local/lib
+/opt/lib
+
+# End /etc/ld.so.conf</literal>
+EOF</userinput></screen>
+
+  </sect2>
+
+  <sect2 id="contents-eglibc" role="content">
+    <title>Contents of EGlibc</title>
+
+    <segmentedlist>
+      <segtitle>Installed programs</segtitle>
+      <segtitle>Installed libraries</segtitle>
+
+      <seglistitem>
+        <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
+        ldd, lddlibc4, locale, localedef, mtrace, nscd,
+        pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
+        zdump, and zic</seg>
+        <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
+        libbsd-compat.a, libc.[a,so], libcrypt.[a,so], libdl.[a,so], libg.a,
+        libieee.a, libm.[a,so], libmcheck.a, libmemusage.so, libnsl.a,
+        libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
+        libnss_nis.so, libnss_nisplus.so, libpcprofile.so, libpthread.[a,so],
+        libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so, and
+        libutil.[a,so]</seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="catchsegv">
+        <term><command>catchsegv</command></term>
+        <listitem>
+          <para>Can be used to create a stack trace when a program
+          terminates with a segmentation fault</para>
+          <indexterm zone="ch-cross-tools-eglibc catchsegv">
+            <primary sortas="b-catchsegv">catchsegv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="gencat">
+        <term><command>gencat</command></term>
+        <listitem>
+          <para>Generates message catalogues</para>
+          <indexterm zone="ch-cross-tools-eglibc gencat">
+            <primary sortas="b-gencat">gencat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getconf">
+        <term><command>getconf</command></term>
+        <listitem>
+          <para>Displays the system configuration values for file system specific
+          variables</para>
+          <indexterm zone="ch-cross-tools-eglibc getconf">
+            <primary sortas="b-getconf">getconf</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="getent">
+        <term><command>getent</command></term>
+        <listitem>
+          <para>Gets entries from an administrative database</para>
+          <indexterm zone="ch-cross-tools-eglibc getent">
+            <primary sortas="b-getent">getent</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="iconv">
+        <term><command>iconv</command></term>
+        <listitem>
+          <para>Performs character set conversion</para>
+          <indexterm zone="ch-cross-tools-eglibc iconv">
+            <primary sortas="b-iconv">iconv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="iconvconfig">
+        <term><command>iconvconfig</command></term>
+        <listitem>
+          <para>Creates fastloading <command>iconv</command> module configuration
+          files</para>
+          <indexterm zone="ch-cross-tools-eglibc iconvconfig">
+            <primary sortas="b-iconvconfig">iconvconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldconfig">
+        <term><command>ldconfig</command></term>
+        <listitem>
+          <para>Configures the dynamic linker runtime bindings</para>
+          <indexterm zone="ch-cross-tools-eglibc ldconfig">
+            <primary sortas="b-ldconfig">ldconfig</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ldd">
+        <term><command>ldd</command></term>
+        <listitem>
+          <para>Reports which shared libraries are required
+          by each given program or shared library</para>
+          <indexterm zone="ch-cross-tools-eglibc ldd">
+            <primary sortas="b-ldd">ldd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="lddlibc4">
+        <term><command>lddlibc4</command></term>
+        <listitem>
+          <para>Assists <command>ldd</command> with object files</para>
+          <indexterm zone="ch-cross-tools-eglibc lddlibc4">
+            <primary sortas="b-lddlibc4">lddlibc4</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="locale">
+        <term><command>locale</command></term>
+        <listitem>
+          <para>Tells the compiler to enable or disable the use of POSIX locales
+          for built-in operations</para>
+          <indexterm zone="ch-cross-tools-eglibc locale">
+            <primary sortas="b-locale">locale</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="localedef">
+        <term><command>localedef</command></term>
+        <listitem>
+          <para>Compiles locale specifications</para>
+          <indexterm zone="ch-cross-tools-eglibc localedef">
+            <primary sortas="b-localedef">localedef</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="mtrace">
+        <term><command>mtrace</command></term>
+        <listitem>
+          <para>Reads and interprets a memory trace file and
+          displays a summary in human-readable format</para>
+          <indexterm zone="ch-cross-tools-eglibc mtrace">
+            <primary sortas="b-mtrace">mtrace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="nscd">
+        <term><command>nscd</command></term>
+        <listitem>
+          <para>A daemon that provides a cache for the most common name
+          service requests</para>
+          <indexterm zone="ch-cross-tools-eglibc nscd">
+            <primary sortas="b-nscd">nscd</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pcprofiledump">
+        <term><command>pcprofiledump</command></term>
+        <listitem>
+          <para>Dumps information generated by PC profiling</para>
+          <indexterm zone="ch-cross-tools-eglibc pcprofiledump">
+            <primary sortas="b-pcprofiledump">pcprofiledump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="pt_chown">
+        <term><command>pt_chown</command></term>
+        <listitem>
+          <para>A helper program for <command>grantpt</command> to set the owner,
+          group and access permissions of a slave pseudo terminal</para>
+          <indexterm zone="ch-cross-tools-eglibc pt_chown">
+            <primary sortas="b-pt_chown">pt_chown</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcgen">
+        <term><command>rpcgen</command></term>
+        <listitem>
+          <para>Generates C code to implement the Remote Procecure Call (RPC)
+          protocol</para>
+          <indexterm zone="ch-cross-tools-eglibc rpcgen">
+            <primary sortas="b-rpcgen">rpcgen</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="rpcinfo">
+        <term><command>rpcinfo</command></term>
+        <listitem>
+          <para>Makes an RPC call to an RPC server</para>
+          <indexterm zone="ch-cross-tools-eglibc rpcinfo">
+            <primary sortas="b-rpcinfo">rpcinfo</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sln">
+        <term><command>sln</command></term>
+        <listitem>
+          <para>A statically linked program that creates symbolic links</para>
+          <indexterm zone="ch-cross-tools-eglibc sln">
+            <primary sortas="b-sln">sln</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="sprof">
+        <term><command>sprof</command></term>
+        <listitem>
+          <para>Reads and displays shared object profiling data</para>
+          <indexterm zone="ch-cross-tools-eglibc sprof">
+            <primary sortas="b-sprof">sprof</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="tzselect">
+        <term><command>tzselect</command></term>
+        <listitem>
+          <para>Asks the user about the location of the
+          system and reports the corresponding time zone description</para>
+          <indexterm zone="ch-cross-tools-eglibc tzselect">
+            <primary sortas="b-tzselect">tzselect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="xtrace">
+        <term><command>xtrace</command></term>
+        <listitem>
+          <para>Traces the execution of a program by
+          printing the currently executed function</para>
+          <indexterm zone="ch-cross-tools-eglibc xtrace">
+            <primary sortas="b-xtrace">xtrace</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="zdump">
+        <term><command>zdump</command></term>
+        <listitem>
+          <para>The time zone dumper</para>
+          <indexterm zone="ch-cross-tools-eglibc zdump">
+            <primary sortas="b-zdump">zdump</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="zic">
+        <term><command>zic</command></term>
+        <listitem>
+          <para>The time zone compiler</para>
+          <indexterm zone="ch-cross-tools-eglibc zic">
+            <primary sortas="b-zic">zic</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="ld.so">
+        <term><filename class="libraryfile">ld.so</filename></term>
+        <listitem>
+          <para>The helper program for shared library executables</para>
+          <indexterm zone="ch-cross-tools-eglibc ld.so">
+            <primary sortas="c-ld.so">ld.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libBrokenLocale">
+        <term><filename class="libraryfile">libBrokenLocale</filename></term>
+        <listitem>
+          <para>Used by programs, such as Mozilla, to solve broken locales</para>
+          <indexterm zone="ch-cross-tools-eglibc libBrokenLocale">
+            <primary sortas="c-libBrokenLocale">libBrokenLocale</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libSegFault">
+        <term><filename class="libraryfile">libSegFault</filename></term>
+        <listitem>
+          <para>The segmentation fault signal handler</para>
+          <indexterm zone="ch-cross-tools-eglibc libSegFault">
+            <primary sortas="c-libSegFault">libSegFault</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libanl">
+        <term><filename class="libraryfile">libanl</filename></term>
+        <listitem>
+          <para>An asynchronous name lookup library</para>
+          <indexterm zone="ch-cross-tools-eglibc libanl">
+            <primary sortas="c-libanl">libanl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libbsd-compat">
+        <term><filename class="libraryfile">libbsd-compat</filename></term>
+        <listitem>
+          <para>Provides the portability needed
+          in order to run certain Berkey Software Distribution (BSD) programs
+          under Linux</para>
+          <indexterm zone="ch-cross-tools-eglibc libbsd-compat">
+            <primary sortas="c-libbsd-compat">libbsd-compat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libc">
+        <term><filename class="libraryfile">libc</filename></term>
+        <listitem>
+          <para>The main C library</para>
+          <indexterm zone="ch-cross-tools-eglibc libc">
+            <primary sortas="c-libc">libc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libcrypt">
+        <term><filename class="libraryfile">libcrypt</filename></term>
+        <listitem>
+          <para>The cryptography library</para>
+          <indexterm zone="ch-cross-tools-eglibc libcrypt">
+            <primary sortas="c-libcrypt">libcrypt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libdl">
+        <term><filename class="libraryfile">libdl</filename></term>
+        <listitem>
+          <para>The dynamic linking interface library</para>
+          <indexterm zone="ch-cross-tools-eglibc libdl">
+            <primary sortas="c-libdl">libdl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libg">
+        <term><filename class="libraryfile">libg</filename></term>
+        <listitem>
+          <para>A runtime library for <command>g++</command></para>
+          <indexterm zone="ch-cross-tools-eglibc libg">
+            <primary sortas="c-libg">libg</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libieee">
+        <term><filename class="libraryfile">libieee</filename></term>
+        <listitem>
+          <para>The Institute of Electrical and Electronic Engineers (IEEE)
+          floating point library</para>
+          <indexterm zone="ch-cross-tools-eglibc libieee">
+            <primary sortas="c-libieee">libieee</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libm">
+        <term><filename class="libraryfile">libm</filename></term>
+        <listitem>
+          <para>The mathematical library</para>
+          <indexterm zone="ch-cross-tools-eglibc libm">
+            <primary sortas="c-libm">libm</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmcheck">
+        <term><filename class="libraryfile">libmcheck</filename></term>
+        <listitem>
+          <para>Contains code run at boot</para>
+          <indexterm zone="ch-cross-tools-eglibc libmcheck">
+            <primary sortas="c-libmcheck">libmcheck</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libmemusage">
+        <term><filename class="libraryfile">libmemusage</filename></term>
+        <listitem>
+          <para>Used by <command>memusage</command> (included in EGlibc, but
+          not built in a base CLFS system as it has additional dependencies)
+          to help collect information about the memory usage of a program</para>
+          <indexterm zone="ch-cross-tools-eglibc libmemusage">
+            <primary sortas="c-libmemusage">libmemusage</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnsl">
+        <term><filename class="libraryfile">libnsl</filename></term>
+        <listitem>
+          <para>The network services library</para>
+          <indexterm zone="ch-cross-tools-eglibc libnsl">
+            <primary sortas="c-libnsl">libnsl</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libnss">
+        <term><filename class="libraryfile">libnss</filename></term>
+        <listitem>
+          <para>The Name Service Switch libraries, containing functions for
+          resolving host names, user names, group names, aliases, services,
+          protocols, etc.</para>
+          <indexterm zone="ch-cross-tools-eglibc libnss">
+            <primary sortas="c-libnss">libnss</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpcprofile">
+        <term><filename class="libraryfile">libpcprofile</filename></term>
+        <listitem>
+          <para>Contains profiling functions used to track the amount of CPU
+          time spent in specific source code lines</para>
+          <indexterm zone="ch-cross-tools-eglibc libpcprofile">
+            <primary sortas="c-libpcprofile">libpcprofile</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libpthread">
+        <term><filename class="libraryfile">libpthread</filename></term>
+        <listitem>
+          <para>The POSIX threads library</para>
+          <indexterm zone="ch-cross-tools-eglibc libpthread">
+            <primary sortas="c-libpthread">libpthread</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libresolv">
+        <term><filename class="libraryfile">libresolv</filename></term>
+        <listitem>
+          <para>Contains functions for creating, sending, and interpreting
+          packets to the Internet domain name servers</para>
+          <indexterm zone="ch-cross-tools-eglibc libresolv">
+            <primary sortas="c-libresolv">libresolv</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="librpcsvc">
+        <term><filename class="libraryfile">librpcsvc</filename></term>
+        <listitem>
+          <para>Contains functions providing miscellaneous RPC services</para>
+          <indexterm zone="ch-cross-tools-eglibc librpcsvc">
+            <primary sortas="c-librpcsvc">librpcsvc</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="librt">
+        <term><filename class="libraryfile">librt</filename></term>
+        <listitem>
+          <para>Contains functions providing most of the interfaces specified by
+          the POSIX.1b Realtime Extension</para>
+          <indexterm zone="ch-cross-tools-eglibc librt">
+            <primary sortas="c-librt">librt</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libthread_db">
+        <term><filename class="libraryfile">libthread_db</filename></term>
+        <listitem>
+          <para>Contains functions useful for
+          building debuggers for multi-threaded programs</para>
+          <indexterm zone="ch-cross-tools-eglibc libthread_db">
+            <primary sortas="c-libthread_db">libthread_db</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libutil">
+        <term><filename class="libraryfile">libutil</filename></term>
+        <listitem>
+          <para>Contains code for <quote>standard</quote> functions used in
+          many different Unix utilities</para>
+          <indexterm zone="ch-cross-tools-eglibc libutil">
+            <primary sortas="c-libutil">libutil</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>
Index: BOOK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/common/gcc-static.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -78,5 +78,5 @@
           include files, since they haven't been created for this architecture
           yet. GCC will be able to find the multi-thread information after
-          the Glibc headers are created.</para>
+          the EGlibc headers are created.</para>
         </listitem>
       </varlistentry>
Index: OK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,870 +1,0 @@
-<?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-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Glibc package contains the main C library. This library provides
-    the basic routines for allocating memory, searching directories, opening and
-    closing files, reading and writing files, string handling, pattern matching,
-    arithmetic, and so on.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <note os="a">
-      <para>Some packages outside of CLFS suggest installing GNU libiconv in
-      order to translate data from one encoding to another. The project's
-      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
-      <quote>This library provides an <function>iconv()</function>
-      implementation, for use on systems which don't have one, or whose
-      implementation cannot convert from/to Unicode.</quote> Glibc provides
-      an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on an CLFS system.</para>
-    </note>
-
-    <para os="p1">The Glibc build will expect to find
-    <filename>libgcc_eh</filename>, but this library is not installed when GCC
-    is built without "--enable-shared". As a result, the Glibc build will fail.
-    The following patch will force Glibc to  check for the existance of
-    <filename>libgcc_eh</filename> and try to link to it only if it exists:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
-
-    <para os="p3">The following patch fixes an issue that can
-    cause <command>localdef</command> to segfault:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
-
-    <para os="p5">The following patch builds <filename>zic-native</filename>,
-    <filename>localedef-native</filename>, and
-    <filename>rpcgen-native</filename>. <filename>zic-native</filename> is used
-    to generate the zoneinfo, <filename>localedef-native</filename> is used to
-    generate the locale archive, and <filename>rpcgen-native</filename> is used
-    to generate part of <filename>librpcsvc.a</filename>. All of these programs
-    would normally not be available when cross-compiling:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&glibc-cross_hacks-patch;</userinput></screen>
-
-    <para os="b">The Glibc documentation recommends building Glibc outside of the
-    source directory in a dedicated build directory:</para>
-
-<screen os="c"><userinput>mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
-
-    <para os="d">The following lines need to be added to
-    <filename>config.cache</filename> for Glibc to support NPTL:</para>
-
-<screen os="e"><userinput>cat &gt; config.cache &lt;&lt; EOF
-libc_cv_forced_unwind=yes
-libc_cv_c_cleanup=yes
-libc_cv_gnu89_inline=yes
-EOF</userinput></screen>
-
-    <para os="f">The following line needs to be added to
-    <filename>configparms</filename> to adjust installation paths:</para>
-
-<screen os="g"><userinput>cat &gt; configparms &lt;&lt; EOF
-install_root=${CLFS}
-EOF</userinput></screen>
-
-    <para os="h">Prepare Glibc for compilation:</para>
-
-<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
-    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
-    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="j1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the compiler on the host system. This is
-          used to create the tools Glibc uses during its build.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j2">
-        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the GCC compiler that we made for our target
-          architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j3">
-        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ar</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j4">
-        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ranlib</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This builds the libraries without profiling information.
-          Omit this option if profiling on the temporary tools is necessary.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize all add-ons that are
-          available.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use Thread Local Storage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j8">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use use the __thread for libc and
-          libpthread builds.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j9">
-        <term><parameter>--with-binutils=${CLFS}/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the Binutils that are specific to
-          our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="j10">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize a premade cache file.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="k">During this stage the following warning might appear:</para>
-
-<blockquote os="l"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="m">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="n">Compile the package:</para>
-
-<screen os="o"><userinput>make</userinput></screen>
-
-    <para os="p">Install the package:</para>
-
-<screen os="q"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="i18n-glibc" role="configuration">
-    <title>Internationalization</title>
-
-    <para>The locales that can make the system respond in a different
-    language were not installed by the above command. Install them
-    with:</para>
-
-<screen><userinput>make localedata/install-locales</userinput></screen>
-
-    <para>To save time, an alternative to running the previous command (which
-    generates and installs every locale listed in the
-    glibc-&glibc-version;/localedata/SUPPORTED file) is to install only
-    those locales that are wanted and needed. This can be achieved by using
-    the <command>localedef</command> command. Information on this command is
-    located in the <filename>INSTALL</filename> file in the Glibc source.
-    However, there are a number of locales that are essential in order for the
-    tests of future packages to pass, in particular, the
-    <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
-    instead of the <parameter>install-locales</parameter> target used above,
-    will install the minimum set of locales necessary for the tests to run
-    successfully:</para>
-
-<screen role="nodump"><userinput>mkdir -pv ${CLFS}/usr/lib/locale
-export I18NPATH=${PWD}/localedata
-export GCONV_PATH=${PWD}/iconvdata
-export LOCALEDEF="${PWD}/locale/localedef-native \
-    --alias-file=../intl/locale.alias"
-cd ../glibc-&glibc-version;/localedata
-${LOCALEDEF} -i locales/de_DE -f charmaps/ISO-8859-1 --prefix=${CLFS} de_DE
-${LOCALEDEF} -i locales/de_DE@euro -f charmaps/ISO-8859-15 \
-    --prefix=${CLFS} de_DE@euro
-${LOCALEDEF} -i locales/en_HK -f charmaps/ISO-8859-1 --prefix=${CLFS} en_HK
-${LOCALEDEF} -i locales/en_PH -f charmaps/ISO-8859-1 --prefix=${CLFS} en_PH
-${LOCALEDEF} -i locales/en_US -f charmaps/ISO-8859-1 --prefix=${CLFS} en_US
-${LOCALEDEF} -i locales/es_MX -f charmaps/ISO-8859-1 --prefix=${CLFS} es_MX
-${LOCALEDEF} -i locales/fa_IR -f charmaps/UTF-8 --prefix=${CLFS} fa_IR
-${LOCALEDEF} -i locales/fr_FR -f charmaps/ISO-8859-1 --prefix=${CLFS} fr_FR
-${LOCALEDEF} -i locales/fr_FR@euro -f charmaps/ISO-8859-15 \
-    --prefix=${CLFS} fr_FR@euro
-${LOCALEDEF} -i locales/it_IT -f charmaps/ISO-8859-1 --prefix=${CLFS} it_IT
-${LOCALEDEF} -i locales/ja_JP -f charmaps/EUC-JP --prefix=${CLFS} ja_JP
-unset I18NPATH GCONV_PATH LOCALEDEF</userinput></screen>
-
-    <para>Some locales installed by the <command>make
-    localedata/install-locales</command> command above are not properly
-    supported by some applications that are in the CLFS and BLFS books. Because
-    of the various problems that arise due to application programmers making
-    assumptions that break in such locales, CLFS should not be used in locales
-    that utilize multibyte character sets (including UTF-8) or right-to-left
-    writing order.  Numerous unofficial and unstable patches are required to
-    fix these problems, and it has been decided by the CLFS developers not to
-    support such complex locales at this time. This applies to the ja_JP and
-    fa_IR locales as well&mdash;they have been installed only for GCC and
-    Gettext tests to pass, and the <command>watch</command> program (part of
-    the Procps package) does not work properly in them. Various attempts to
-    circumvent these restrictions are documented in internationalization-related
-    hints.</para>
-
-  </sect2>
-
-  <sect2 id="conf-glibc" role="configuration">
-    <title>Configuring Glibc</title>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
-    </indexterm>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
-    </indexterm>
-
-    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although Glibc provides defaults when this file is missing or
-    corrupt, the Glibc defaults do not work well in a networked environment.
-    The time zone also needs to be configured.</para>
-
-    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/nsswitch.conf &lt;&lt; "EOF"
-<literal># Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-# End /etc/nsswitch.conf</literal>
-EOF</userinput></screen>
-
-    <para>To determine the local time zone, run the following script:</para>
-
-<screen role="nodump"><userinput>TZDIR="${CLFS}/usr/share/zoneinfo" ${CLFS}/usr/bin/tzselect</userinput></screen>
-
-    <para>After answering a few questions about the location, the script will
-    output the name of the time zone (e.g., <emphasis>EST5EDT</emphasis> or
-    <emphasis>Canada/Eastern</emphasis>). Then create the
-    <filename>/etc/localtime</filename> file by running:</para>
-
-<screen><userinput>cp -v --remove-destination ${CLFS}/usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
-    ${CLFS}/etc/localtime</userinput></screen>
-
-    <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
-    that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
-
-    <variablelist>
-      <title>The meaning of the cp option:</title>
-
-      <varlistentry>
-        <term><parameter>--remove-destination</parameter></term>
-        <listitem>
-          <para>This is needed to force removal of the already existing symbolic
-          link. The reason for copying the file instead of using a symlink is to
-          cover the situation where <filename class="directory">/usr</filename>
-          is on a separate partition. This could be important when booted into
-          single user mode.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The 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. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</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; ${CLFS}/etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/opt/lib
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-glibc" role="content">
-    <title>Contents of Glibc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
-        ldd, lddlibc4, locale, localedef, mtrace, nscd,
-        pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
-        zdump, and zic</seg>
-        <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
-        libbsd-compat.a, libc.[a,so], libcrypt.[a,so], libdl.[a,so], libg.a,
-        libieee.a, libm.[a,so], libmcheck.a, libmemusage.so, libnsl.a,
-        libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
-        libnss_nis.so, libnss_nisplus.so, libpcprofile.so, libpthread.[a,so],
-        libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so, and
-        libutil.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="catchsegv">
-        <term><command>catchsegv</command></term>
-        <listitem>
-          <para>Can be used to create a stack trace when a program
-          terminates with a segmentation fault</para>
-          <indexterm zone="ch-cross-tools-glibc catchsegv">
-            <primary sortas="b-catchsegv">catchsegv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencat">
-        <term><command>gencat</command></term>
-        <listitem>
-          <para>Generates message catalogues</para>
-          <indexterm zone="ch-cross-tools-glibc gencat">
-            <primary sortas="b-gencat">gencat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getconf">
-        <term><command>getconf</command></term>
-        <listitem>
-          <para>Displays the system configuration values for file system specific
-          variables</para>
-          <indexterm zone="ch-cross-tools-glibc getconf">
-            <primary sortas="b-getconf">getconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getent">
-        <term><command>getent</command></term>
-        <listitem>
-          <para>Gets entries from an administrative database</para>
-          <indexterm zone="ch-cross-tools-glibc getent">
-            <primary sortas="b-getent">getent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconv">
-        <term><command>iconv</command></term>
-        <listitem>
-          <para>Performs character set conversion</para>
-          <indexterm zone="ch-cross-tools-glibc iconv">
-            <primary sortas="b-iconv">iconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconvconfig">
-        <term><command>iconvconfig</command></term>
-        <listitem>
-          <para>Creates fastloading <command>iconv</command> module configuration
-          files</para>
-          <indexterm zone="ch-cross-tools-glibc iconvconfig">
-            <primary sortas="b-iconvconfig">iconvconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldconfig">
-        <term><command>ldconfig</command></term>
-        <listitem>
-          <para>Configures the dynamic linker runtime bindings</para>
-          <indexterm zone="ch-cross-tools-glibc ldconfig">
-            <primary sortas="b-ldconfig">ldconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldd">
-        <term><command>ldd</command></term>
-        <listitem>
-          <para>Reports which shared libraries are required
-          by each given program or shared library</para>
-          <indexterm zone="ch-cross-tools-glibc ldd">
-            <primary sortas="b-ldd">ldd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lddlibc4">
-        <term><command>lddlibc4</command></term>
-        <listitem>
-          <para>Assists <command>ldd</command> with object files</para>
-          <indexterm zone="ch-cross-tools-glibc lddlibc4">
-            <primary sortas="b-lddlibc4">lddlibc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locale">
-        <term><command>locale</command></term>
-        <listitem>
-          <para>Tells the compiler to enable or disable the use of POSIX locales
-          for built-in operations</para>
-          <indexterm zone="ch-cross-tools-glibc locale">
-            <primary sortas="b-locale">locale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localedef">
-        <term><command>localedef</command></term>
-        <listitem>
-          <para>Compiles locale specifications</para>
-          <indexterm zone="ch-cross-tools-glibc localedef">
-            <primary sortas="b-localedef">localedef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mtrace">
-        <term><command>mtrace</command></term>
-        <listitem>
-          <para>Reads and interprets a memory trace file and
-          displays a summary in human-readable format</para>
-          <indexterm zone="ch-cross-tools-glibc mtrace">
-            <primary sortas="b-mtrace">mtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nscd">
-        <term><command>nscd</command></term>
-        <listitem>
-          <para>A daemon that provides a cache for the most common name
-          service requests</para>
-          <indexterm zone="ch-cross-tools-glibc nscd">
-            <primary sortas="b-nscd">nscd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcprofiledump">
-        <term><command>pcprofiledump</command></term>
-        <listitem>
-          <para>Dumps information generated by PC profiling</para>
-          <indexterm zone="ch-cross-tools-glibc pcprofiledump">
-            <primary sortas="b-pcprofiledump">pcprofiledump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pt_chown">
-        <term><command>pt_chown</command></term>
-        <listitem>
-          <para>A helper program for <command>grantpt</command> to set the owner,
-          group and access permissions of a slave pseudo terminal</para>
-          <indexterm zone="ch-cross-tools-glibc pt_chown">
-            <primary sortas="b-pt_chown">pt_chown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcgen">
-        <term><command>rpcgen</command></term>
-        <listitem>
-          <para>Generates C code to implement the Remote Procecure Call (RPC)
-          protocol</para>
-          <indexterm zone="ch-cross-tools-glibc rpcgen">
-            <primary sortas="b-rpcgen">rpcgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcinfo">
-        <term><command>rpcinfo</command></term>
-        <listitem>
-          <para>Makes an RPC call to an RPC server</para>
-          <indexterm zone="ch-cross-tools-glibc rpcinfo">
-            <primary sortas="b-rpcinfo">rpcinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sln">
-        <term><command>sln</command></term>
-        <listitem>
-          <para>A statically linked program that creates symbolic links</para>
-          <indexterm zone="ch-cross-tools-glibc sln">
-            <primary sortas="b-sln">sln</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sprof">
-        <term><command>sprof</command></term>
-        <listitem>
-          <para>Reads and displays shared object profiling data</para>
-          <indexterm zone="ch-cross-tools-glibc sprof">
-            <primary sortas="b-sprof">sprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tzselect">
-        <term><command>tzselect</command></term>
-        <listitem>
-          <para>Asks the user about the location of the
-          system and reports the corresponding time zone description</para>
-          <indexterm zone="ch-cross-tools-glibc tzselect">
-            <primary sortas="b-tzselect">tzselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xtrace">
-        <term><command>xtrace</command></term>
-        <listitem>
-          <para>Traces the execution of a program by
-          printing the currently executed function</para>
-          <indexterm zone="ch-cross-tools-glibc xtrace">
-            <primary sortas="b-xtrace">xtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zdump">
-        <term><command>zdump</command></term>
-        <listitem>
-          <para>The time zone dumper</para>
-          <indexterm zone="ch-cross-tools-glibc zdump">
-            <primary sortas="b-zdump">zdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zic">
-        <term><command>zic</command></term>
-        <listitem>
-          <para>The time zone compiler</para>
-          <indexterm zone="ch-cross-tools-glibc zic">
-            <primary sortas="b-zic">zic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld.so</filename></term>
-        <listitem>
-          <para>The helper program for shared library executables</para>
-          <indexterm zone="ch-cross-tools-glibc ld.so">
-            <primary sortas="c-ld.so">ld.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libBrokenLocale">
-        <term><filename class="libraryfile">libBrokenLocale</filename></term>
-        <listitem>
-          <para>Used by programs, such as Mozilla, to solve broken locales</para>
-          <indexterm zone="ch-cross-tools-glibc libBrokenLocale">
-            <primary sortas="c-libBrokenLocale">libBrokenLocale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSegFault">
-        <term><filename class="libraryfile">libSegFault</filename></term>
-        <listitem>
-          <para>The segmentation fault signal handler</para>
-          <indexterm zone="ch-cross-tools-glibc libSegFault">
-            <primary sortas="c-libSegFault">libSegFault</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanl">
-        <term><filename class="libraryfile">libanl</filename></term>
-        <listitem>
-          <para>An asynchronous name lookup library</para>
-          <indexterm zone="ch-cross-tools-glibc libanl">
-            <primary sortas="c-libanl">libanl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbsd-compat">
-        <term><filename class="libraryfile">libbsd-compat</filename></term>
-        <listitem>
-          <para>Provides the portability needed
-          in order to run certain Berkey Software Distribution (BSD) programs
-          under Linux</para>
-          <indexterm zone="ch-cross-tools-glibc libbsd-compat">
-            <primary sortas="c-libbsd-compat">libbsd-compat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libc">
-        <term><filename class="libraryfile">libc</filename></term>
-        <listitem>
-          <para>The main C library</para>
-          <indexterm zone="ch-cross-tools-glibc libc">
-            <primary sortas="c-libc">libc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrypt">
-        <term><filename class="libraryfile">libcrypt</filename></term>
-        <listitem>
-          <para>The cryptography library</para>
-          <indexterm zone="ch-cross-tools-glibc libcrypt">
-            <primary sortas="c-libcrypt">libcrypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdl">
-        <term><filename class="libraryfile">libdl</filename></term>
-        <listitem>
-          <para>The dynamic linking interface library</para>
-          <indexterm zone="ch-cross-tools-glibc libdl">
-            <primary sortas="c-libdl">libdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libg">
-        <term><filename class="libraryfile">libg</filename></term>
-        <listitem>
-          <para>A runtime library for <command>g++</command></para>
-          <indexterm zone="ch-cross-tools-glibc libg">
-            <primary sortas="c-libg">libg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libieee">
-        <term><filename class="libraryfile">libieee</filename></term>
-        <listitem>
-          <para>The Institute of Electrical and Electronic Engineers (IEEE)
-          floating point library</para>
-          <indexterm zone="ch-cross-tools-glibc libieee">
-            <primary sortas="c-libieee">libieee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libm">
-        <term><filename class="libraryfile">libm</filename></term>
-        <listitem>
-          <para>The mathematical library</para>
-          <indexterm zone="ch-cross-tools-glibc libm">
-            <primary sortas="c-libm">libm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmcheck">
-        <term><filename class="libraryfile">libmcheck</filename></term>
-        <listitem>
-          <para>Contains code run at boot</para>
-          <indexterm zone="ch-cross-tools-glibc libmcheck">
-            <primary sortas="c-libmcheck">libmcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmemusage">
-        <term><filename class="libraryfile">libmemusage</filename></term>
-        <listitem>
-          <para>Used by <command>memusage</command> (included in Glibc, but
-          not built in a base CLFS system as it has additional dependencies)
-          to help collect information about the memory usage of a program</para>
-          <indexterm zone="ch-cross-tools-glibc libmemusage">
-            <primary sortas="c-libmemusage">libmemusage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnsl">
-        <term><filename class="libraryfile">libnsl</filename></term>
-        <listitem>
-          <para>The network services library</para>
-          <indexterm zone="ch-cross-tools-glibc libnsl">
-            <primary sortas="c-libnsl">libnsl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss">
-        <term><filename class="libraryfile">libnss</filename></term>
-        <listitem>
-          <para>The Name Service Switch libraries, containing functions for
-          resolving host names, user names, group names, aliases, services,
-          protocols, etc.</para>
-          <indexterm zone="ch-cross-tools-glibc libnss">
-            <primary sortas="c-libnss">libnss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcprofile">
-        <term><filename class="libraryfile">libpcprofile</filename></term>
-        <listitem>
-          <para>Contains profiling functions used to track the amount of CPU
-          time spent in specific source code lines</para>
-          <indexterm zone="ch-cross-tools-glibc libpcprofile">
-            <primary sortas="c-libpcprofile">libpcprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpthread">
-        <term><filename class="libraryfile">libpthread</filename></term>
-        <listitem>
-          <para>The POSIX threads library</para>
-          <indexterm zone="ch-cross-tools-glibc libpthread">
-            <primary sortas="c-libpthread">libpthread</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libresolv">
-        <term><filename class="libraryfile">libresolv</filename></term>
-        <listitem>
-          <para>Contains functions for creating, sending, and interpreting
-          packets to the Internet domain name servers</para>
-          <indexterm zone="ch-cross-tools-glibc libresolv">
-            <primary sortas="c-libresolv">libresolv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librpcsvc">
-        <term><filename class="libraryfile">librpcsvc</filename></term>
-        <listitem>
-          <para>Contains functions providing miscellaneous RPC services</para>
-          <indexterm zone="ch-cross-tools-glibc librpcsvc">
-            <primary sortas="c-librpcsvc">librpcsvc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librt">
-        <term><filename class="libraryfile">librt</filename></term>
-        <listitem>
-          <para>Contains functions providing most of the interfaces specified by
-          the POSIX.1b Realtime Extension</para>
-          <indexterm zone="ch-cross-tools-glibc librt">
-            <primary sortas="c-librt">librt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthread_db">
-        <term><filename class="libraryfile">libthread_db</filename></term>
-        <listitem>
-          <para>Contains functions useful for
-          building debuggers for multi-threaded programs</para>
-          <indexterm zone="ch-cross-tools-glibc libthread_db">
-            <primary sortas="c-libthread_db">libthread_db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libutil">
-        <term><filename class="libraryfile">libutil</filename></term>
-        <listitem>
-          <para>Contains code for <quote>standard</quote> functions used in
-          many different Unix utilities</para>
-          <indexterm zone="ch-cross-tools-glibc libutil">
-            <primary sortas="c-libutil">libutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: BOOK/cross-tools/common/shadow.xml
===================================================================
--- BOOK/cross-tools/common/shadow.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/common/shadow.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -33,5 +33,5 @@
 
     <para>The following value causes Shadow to use its internal lckpwdf
-    instead of the one provided by Glibc. The one provided by Glibc will
+    instead of the one provided by EGlibc. The one provided by EGlibc will
     attempt to modify the host system:</para>
 
Index: BOOK/cross-tools/hppa-chapter.xml
===================================================================
--- BOOK/cross-tools/hppa-chapter.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/hppa-chapter.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hppa/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="hppa/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
Index: BOOK/cross-tools/hppa/eglibc.xml
===================================================================
--- BOOK/cross-tools/hppa/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ BOOK/cross-tools/hppa/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,138 @@
+<?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">
+  <title>EGlibc-&eglibc-version;</title>
+
+  <?dbhtml filename="eglibc.html"?>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGlibc">EGlibc</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of EGlibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/eglibc.xml"
+    xpointer="xpointer(//*[@os='u1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../arm/eglibc.xml"
+    xpointer="xpointer(//*[@os='u2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+    ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.9 \
+    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
+    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('i18n-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('contents-eglibc'))"/>
+
+</sect1>
Index: OK/cross-tools/hppa/glibc.xml
===================================================================
--- BOOK/cross-tools/hppa/glibc.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?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-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../arm/glibc.xml"
-    xpointer="xpointer(//*[@os='u1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../arm/glibc.xml"
-    xpointer="xpointer(//*[@os='u2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.9 \
-    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
-    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: BOOK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/cross-tools/x86-chapter.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -22,5 +22,5 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/eglibc.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,131 @@
+<?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">
+  <title>EGlibc-&eglibc-version;</title>
+
+  <?dbhtml filename="eglibc.html"?>
+
+  <indexterm zone="ch-cross-tools-eglibc">
+    <primary sortas="a-EGlibc">EGlibc</primary>
+  </indexterm>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(//*[@role='package'])"/>
+
+  <sect2 role="installation">
+    <title>Installation of EGlibc</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='a'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='c'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='d'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='e'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='f'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='g'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='h'])"/>
+
+<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
+    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
+    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; ${CLFS_TARGET}) -mtune=generic -g -O2" \
+    ../eglibc-&eglibc-version;/configure --prefix=/usr \
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
+    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
+    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
+    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='j'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='m'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='n'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='o'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='q'])"/>
+
+  </sect2>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('i18n-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-eglibc'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('conf-ld'))"/>
+
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+  href="../common/eglibc.xml"
+  xpointer="xpointer(id('contents-eglibc'))"/>
+
+</sect1>
Index: OK/cross-tools/x86/glibc.xml
===================================================================
--- BOOK/cross-tools/x86/glibc.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?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-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; ${CLFS_TARGET}) -mtune=generic -g -O2" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons --with-tls --enable-kernel=2.6.0 \
-    --with-__thread --with-binutils=${CLFS}/cross-tools/bin \
-    --with-headers=${CLFS}/usr/include --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: BOOK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-preps/settingenviron.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -71,5 +71,5 @@
   <para os="i">The <envar>LC_ALL</envar> variable controls the localization of
   certain programs, making their messages follow the conventions of a
-  specified country.  If the host system uses a version of Glibc older
+  specified country.  If the host system uses a version of EGlibc older
   than 2.2.4, having <envar>LC_ALL</envar> set to something other than
   <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
Index: BOOK/final-system/common/aboutdebug.xml
===================================================================
--- BOOK/final-system/common/aboutdebug.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-system/common/aboutdebug.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -29,10 +29,10 @@
     </listitem>
     <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>
+      <para>EGlibc and GCC files (<filename class="directory">/lib</filename>
       and <filename class="directory">/usr/lib</filename>) with debugging
       symbols: 87 MB</para>
     </listitem>
     <listitem os="c4">
-      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
+      <para>EGlibc and GCC files without debugging symbols: 16 MB</para>
     </listitem>
   </itemizedlist>
Index: BOOK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-system/common/bash.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -36,5 +36,5 @@
     become an unprivileged user, this combination will cause Bash to build
     without <emphasis>process substitution</emphasis>, which will break one
-    of the c++ test scripts in <literal>glibc</literal>. The following prevents
+    of the c++ test scripts in <literal>eglibc</literal>. The following prevents
     future problems by skipping tests that can not run while cross-compiling
     or that do not run properly:</para>
Index: BOOK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-system/common/gzip.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -29,5 +29,5 @@
 
     <para os="s1">The following command renames the internal implementation of
-    futimens to gl_futimens as newer versions of Glibc provide an incompatible
+    futimens to gl_futimens as newer versions of EGlibc provide an incompatible
     version:</para>
 
Index: BOOK/final-system/common/introduction.xml
===================================================================
--- BOOK/final-system/common/introduction.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-system/common/introduction.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -32,5 +32,5 @@
   the code and build tools.  Also note that the <option>-march</option>
   and <option>-mtune</option> options may cause problems with the toolchain
-  packages (Binutils, GCC and Glibc). The small potential gains achieved in
+  packages (Binutils, GCC and EGlibc). The small potential gains achieved in
   using compiler optimizations are often outweighed by the risks. First-time
   builders of CLFS are encouraged to build without custom optimizations.
Index: BOOK/final-system/common/pkgmgt.xml
===================================================================
--- BOOK/final-system/common/pkgmgt.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/final-system/common/pkgmgt.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -50,12 +50,12 @@
     <itemizedlist>
       <listitem>
-        <para>If one of the toolchain packages (Glibc, GCC or Binutils) needs
+        <para>If one of the toolchain packages (EGlibc, GCC or Binutils) needs
         to be upgraded to a newer minor version, it is safer to
         rebuild CLFS. Though you <emphasis>may</emphasis> be able to get by
         rebuilding all the packages in their dependency order, we do not
-        recommend it. For example, if glibc-2.2.x needs to be updated to
-        glibc-2.3.x, it is safer to rebuild. For micro version updates, a
+        recommend it. For example, if eglibc-2.2.x needs to be updated to
+        eglibc-2.3.x, it is safer to rebuild. For micro version updates, a
         simple reinstallation usually works, but is not guaranteed. For
-        example, upgrading from glibc-2.3.4 to glibc-2.3.5 will not
+        example, upgrading from eglibc-2.3.4 to glibc-2.3.5 will not
         usually cause any problems.</para>
       </listitem>
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/introduction/common/changelog.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -40,4 +40,10 @@
       <para>July 11, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Bootscripts to 1.2-pre8.</para>
+        </listitem>
+        <listitem>
+          <para>[jciccone] - Updated Glibc to EGlibc 2.10.1.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Add CLooG and PPL for GCC, Based on Winkie's work
Index: BOOK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/introduction/common/how.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -52,5 +52,5 @@
   binutils into ${CLFS}/cross-tools, so that we have an asembler and a linker
   for our target architecture. GCC is then compiled statically and installed
-  into ${CLFS}/cross-tools, this cross-compiler is used to build glibc for the
+  into ${CLFS}/cross-tools, this cross-compiler is used to build EGlibc for the
   final-system. The GCC cross-compiler is then rebuilt dynamically - this final
   cross-compiler is what will be used to build the final-system.</para>
Index: BOOK/materials/arm/packages.xml
===================================================================
--- BOOK/materials/arm/packages.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/materials/arm/packages.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -13,10 +13,10 @@
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Glibc-ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
+    <varlistentry os="eglibcports">
+      <term>EGlibc Ports (&eglibc-ports-version;) - <token>&eglibc-ports-size;</token>:</term>
       <listitem>
-        <para>Home page: <ulink url="&glibc-ports-home;"/></para>
-        <para>Download: <ulink url="&glibc-ports-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-ports-md5;</literal></para>
+        <para>Home page: <ulink url="&eglibc-ports-home;"/></para>
+        <para>Download: <ulink url="&eglibc-ports-url;"/></para>
+        <para>MD5 sum: <literal>&eglibc-ports-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/materials/arm/patches.xml
===================================================================
--- BOOK/materials/arm/patches.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/materials/arm/patches.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -11,25 +11,9 @@
   <title>Additional Patches for ARM</title>
 
+<!--
   <variablelist role="materials">
 
-    <varlistentry>
-      <term>Glibc ARM Setjmp Fix Patch - <token>&glibc-arm_setjmp_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-arm_setjmp_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-arm_setjmp_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc NPTL LowlevelLock Patch - <token>&glibc-nptl_lowlevellock-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-nptl_lowlevellock-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-nptl_lowlevellock-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
   </variablelist>
+-->
 
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/materials/common/packages.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -120,4 +120,13 @@
         <para>Download: <ulink url="&e2fsprogs-url;"/></para>
         <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>EGlibc (&eglibc-version;) - <token>&eglibc-size;</token>:</term>
+      <listitem>
+        <para>Home page: <ulink url="&eglibc-home;"/></para>
+        <para>Download: <ulink url="&eglibc-url;"/></para>
+        <para>MD5 sum: <literal>&eglibc-md5;</literal></para>
       </listitem>
     </varlistentry>
@@ -187,13 +196,4 @@
 
     <varlistentry>
-      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glibc-home;"/></para>
-        <para>Download: <ulink url="&glibc-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>GMP (&gmp-version;) - <token>&gmp-size;</token>:</term>
       <listitem>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/materials/common/patches.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -65,4 +65,13 @@
 
     <varlistentry>
+      <term>EGlibc Fixes Patch - <token>&eglibc-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&eglibc-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&eglibc-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>File Cross-Compile Patch - <token>&file-cross_compile-patch-size;</token>:</term>
       <listitem>
@@ -106,31 +115,4 @@
         url="&patches-root;&gcc-posix-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Cross-Compiling Hacks Patch- <token>&glibc-cross_hacks-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-cross_hacks-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-cross_hacks-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
- 
-    <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-libgcc_eh-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-libgcc_eh-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Localedef Segfault - <token>&glibc-localedef_segfault-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-localedef_segfault-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-localedef_segfault-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/packages.ent	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -36,8 +36,8 @@
 <!ENTITY bison-home "&gnu-software;bison">
 
-<!ENTITY bootscripts-clfs-version "1.2-pre6">
+<!ENTITY bootscripts-clfs-version "1.2-pre8">
 <!ENTITY bootscripts-clfs-size "39 KB">
 <!ENTITY bootscripts-clfs-url "&packages-root;bootscripts-cross-lfs-&bootscripts-clfs-version;.tar.bz2">
-<!ENTITY bootscripts-clfs-md5 "5cd96840c29a6aef01931b7180ba2795">
+<!ENTITY bootscripts-clfs-md5 "4aee3da55c0a4c3f0f50ae6ff209169d">
 <!ENTITY bootscripts-clfs-home " ">
 
@@ -115,18 +115,16 @@
 <!ENTITY gettext-home "&gnu-software;gettext">
 
-<!ENTITY glibc-version "2.9">
-<!ENTITY glibc-size "15,172 KB">
-<!-- <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2"> -->
-<!ENTITY glibc-url "&packages-root;glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "c7d99cfb51aa9132132da068dd648d28">
-<!ENTITY glibc-home "&gnu-software;libc">
-<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
-
-<!ENTITY glibc-ports-version "&glibc-version;">
-<!ENTITY glibc-ports-size "438 KB">
-<!--<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2"> -->
-<!ENTITY glibc-ports-url "&packages-root;glibc-ports-&glibc-version;.tar.bz2">
-<!ENTITY glibc-ports-md5 "b0a06ad355312a6257a6fa41c72dfffb">
-<!ENTITY glibc-ports-home " ">
+<!ENTITY eglibc-version "2.10.1">
+<!ENTITY eglibc-size "15,905 KB">
+<!ENTITY eglibc-url "&packages-root;eglibc-&eglibc-version;.tar.bz2">
+<!ENTITY eglibc-md5 "7aa42c218bfcfe8b7253e9b829c3a2d6">
+<!ENTITY eglibc-home "http://www.eglibc.org/home">
+<!ENTITY eglibc-ld-name "ld-&eglibc-version;.so">
+
+<!ENTITY eglibc-ports-version "&eglibc-version;">
+<!ENTITY eglibc-ports-size "592 KB">
+<!ENTITY eglibc-ports-url "&packages-root;eglibc-ports-&eglibc-version;.tar.bz2">
+<!ENTITY eglibc-ports-md5 "5fd870dfdc02d8e2e93525fb7363c34">
+<!ENTITY eglibc-ports-home " ">
 
 <!ENTITY gmp-version "4.3.1">
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/patches.ent	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -25,4 +25,8 @@
 <!ENTITY diffutils-i18n-patch-size "17 KB">
 
+<!ENTITY eglibc-fixes-patch "eglibc-&eglibc-version;-fixes-1.patch">
+<!ENTITY eglibc-fixes-patch-md5 "d6291ad34fbf3f75f5fabc7c3089da06">
+<!ENTITY eglibc-fixes-patch-size "2 KB">
+
 <!ENTITY file-cross_compile-patch "file-&file-version;-cross_compile-1.patch">
 <!ENTITY file-cross_compile-patch-md5 "17956303345b8514a9c2bdc3939a21e5">
@@ -44,24 +48,4 @@
 <!ENTITY gcc-posix-patch-md5 "22e096640c1ac70421336cba0f80d70f">
 <!ENTITY gcc-posix-patch-size "14 KB">
-
-<!ENTITY glibc-arm_setjmp_fix-patch "glibc-&glibc-version;-arm_setjmp_fix-1.patch">
-<!ENTITY glibc-arm_setjmp_fix-patch-md5 "e7a669566af4c79251399fcad858b290">
-<!ENTITY glibc-arm_setjmp_fix-patch-size ".7 KB">
-
-<!ENTITY glibc-cross_hacks-patch "glibc-&glibc-version;-cross_hacks-2.patch">
-<!ENTITY glibc-cross_hacks-patch-md5 "65c72652824b4faa0d9fbcf291151e10">
-<!ENTITY glibc-cross_hacks-patch-size "46 KB">
-
-<!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-libgcc_eh-patch-md5 "1b5106b91ff4111fd97aba99437023ed">
-<!ENTITY glibc-libgcc_eh-patch-size "4 KB">
-
-<!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
-<!ENTITY glibc-localedef_segfault-patch-md5 "a52ecc9fc4ebb6677b772e37ab258120">
-<!ENTITY glibc-localedef_segfault-patch-size "2 KB">
-
-<!ENTITY glibc-nptl_lowlevellock-patch "glibc-&glibc-version;-nptl_lowlevellock-1.patch">
-<!ENTITY glibc-nptl_lowlevellock-patch-md5 "0a428774cf459cf5fd23ff219390c141">
-<!ENTITY glibc-nptl_lowlevellock-patch-size ".8 KB">
 
 <!ENTITY grep-i18n-patch "grep-&grep-version;-i18n-1.patch">
Index: BOOK/prologue/common/hostreqs.xml
===================================================================
--- BOOK/prologue/common/hostreqs.xml	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ BOOK/prologue/common/hostreqs.xml	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -63,6 +63,6 @@
 
     <listitem>
-      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
-      greater than &glibc-version; are not recommended as they have
+      <para><emphasis role="strong">EGlibc-2.2.5</emphasis> (Versions
+      greater than &eglibc-version; are not recommended as they have
       not been tested)</para>
     </listitem>
Index: patches/eglibc-2.10.1-fixes-1.patch
===================================================================
--- patches/eglibc-2.10.1-fixes-1.patch	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
+++ patches/eglibc-2.10.1-fixes-1.patch	(revision 51a1403ceff8bfee4a9937bb76b369a16901f9da)
@@ -0,0 +1,74 @@
+Submitted By: Jim Gifford (jim at cross-lfs dot org)
+Date: 06-07-2009
+Initial Package Version: 2.10.1
+Origin: Upstream
+Upstream Status: Applied
+Description: These are fixes eglibc-2.10.1, and should be
+             rechecked periodically.
+
+diff -Naur libc.orig/elf/ldd.bash.in libc/elf/ldd.bash.in
+--- libc.orig/elf/ldd.bash.in	2009-02-13 18:31:14.000000000 +0000
++++ libc/elf/ldd.bash.in	2009-06-07 23:26:18.000000000 +0000
+@@ -1,4 +1,4 @@
+-#! @BASH@
++#! /bin/bash
+ # Copyright (C) 1996-2008, 2009 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+diff -Naur libc.orig/libio/Makefile libc/libio/Makefile
+--- libc.orig/libio/Makefile	2009-02-05 14:29:56.000000000 +0000
++++ libc/libio/Makefile	2009-06-07 23:26:18.000000000 +0000
+@@ -170,6 +170,7 @@
+ tst-fopenloc-ENV = LOCPATH=$(common-objpfx)localedata \
+ 		   MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace
+ tst-fgetws-ENV = LOCPATH=$(common-objpfx)localedata
++tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata
+ tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata
+ tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
+ bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata
+diff -Naur libc.orig/libio/tst-fgetwc.c libc/libio/tst-fgetwc.c
+--- libc.orig/libio/tst-fgetwc.c	2009-02-05 14:29:56.000000000 +0000
++++ libc/libio/tst-fgetwc.c	2009-06-07 23:26:18.000000000 +0000
+@@ -6,7 +6,7 @@
+ static int
+ do_test (void)
+ {
+-  if (setlocale (LC_ALL, "de_DE.utf8") == NULL)
++  if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL)
+     {
+       puts ("setlocale failed");
+       return 1;
+diff -Naur libc.orig/sunrpc/Makefile libc/sunrpc/Makefile
+--- libc.orig/sunrpc/Makefile	2008-04-25 11:12:05.000000000 +0000
++++ libc/sunrpc/Makefile	2009-06-07 23:26:18.000000000 +0000
+@@ -144,11 +144,11 @@
+ 	$(+link)
+ 
+ $(addprefix $(objpfx)cross-,$(rpcgen-objs)): $(objpfx)cross-%.o: %.c
+-	gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \
++	$(BUILD_CC) $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \
+ 		$(OUTPUT_OPTION) $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-rpcgen: $(addprefix $(objpfx)cross-,$(rpcgen-objs))
+-	gcc $^ -o $@
++	$(BUILD_CC) $^ -o $@
+ 
+ # This makes sure -DNOT_IN_libc is passed for all these modules.
+ cpp-srcs-left := $(rpcgen-objs:.o=.c)
+diff -Naur libc.orig/timezone/Makefile libc/timezone/Makefile
+--- libc.orig/timezone/Makefile	2009-03-03 13:14:09.000000000 +0000
++++ libc/timezone/Makefile	2009-06-07 23:26:18.000000000 +0000
+@@ -181,11 +181,11 @@
+ $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs))
+ 
+ $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
+-	gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
++	$(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
+ 		-DCROSS_ZIC $(compile-mkdep-flags)
+ 
+ $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
+-	gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
++	$(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@
+ 
+ tz-cflags = -DTZDIR='"$(zonedir)"' \
+ 	    -DTZDEFAULT='"$(localtime-file)"' \
Index: tches/glibc-2.9-arm_setjmp_fix-1.patch
===================================================================
--- patches/glibc-2.9-arm_setjmp_fix-1.patch	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,17 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2009-03-31
-Initial Package Version: 2.9
-Origin: http://sourceware.org/ml/libc-ports/2008-12/msg00011.html
-Upstream Status: Unknown
-Descrpition: All the other arm setjmp.S files provide a hidden alias for
-             __sigsetjmp. Without this the build fails.
-
-diff -Naur glibc-2.9.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.9/ports/sysdeps/arm/fpu/setjmp.S
---- glibc-2.9.orig/ports/sysdeps/arm/fpu/setjmp.S	2001-07-06 00:55:48.000000000 -0400
-+++ glibc-2.9/ports/sysdeps/arm/fpu/setjmp.S	2009-03-31 16:54:58.283164106 -0400
-@@ -33,3 +33,5 @@
- 	/* Make a tail call to __sigjmp_save; it takes the same args.  */
- 	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
- END (__sigsetjmp)
-+
-+hidden_def (__sigsetjmp)
Index: tches/glibc-2.9-cross_hacks-2.patch
===================================================================
--- patches/glibc-2.9-cross_hacks-2.patch	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,1142 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2006-11-26
-Initial Package Version: 2.5
-        Rediffed against 2.6 by Joe Ciccone
-        Rediffed against 2.8 by Joe Ciccone on 2009-01-03
-        Rediffed against 2.9 by Joe Ciccone on 2009-03-15
-Origin: Joe Ciccone
-Upstream Status: Unknown
-Description: Adds native compile support to the build system then uses that
-             support to build zic-native, for installing timezone info,
-             rpcgen-native, for building librpcsvc.a, and localedef-native,
-             for creating the locale-archive.
-
-diff -Naur glibc-2.9.orig/iconv/Makefile glibc-2.9/iconv/Makefile
---- glibc-2.9.orig/iconv/Makefile	2007-07-24 23:41:17.000000000 -0400
-+++ glibc-2.9/iconv/Makefile	2009-03-15 19:22:15.732837951 -0400
-@@ -57,6 +57,9 @@
- 		  iconvconfig.h
- 
- others		= iconv_prog iconvconfig
-+ifneq ($(cross-compiling),no)
-+  others-native  = iconvconfig-native
-+endif
- install-others-programs	= $(inst_bindir)/iconv
- install-sbin	= iconvconfig
- 
-@@ -79,6 +82,7 @@
- 
- $(objpfx)iconv_prog: $(iconv_prog-modules:%=$(objpfx)%.o)
- $(objpfx)iconvconfig: $(iconvconfig-modules:%=$(objpfx)%.o)
-+$(objpfx)iconvconfig-native: $(iconvconfig-modules:%=$(objpfx)%-native.o)
- 
- ifneq ($(cross-compiling),yes)
- xtests: test-iconvconfig
-diff -Naur glibc-2.9.orig/iconvdata/Makefile glibc-2.9/iconvdata/Makefile
---- glibc-2.9.orig/iconvdata/Makefile	2008-05-14 21:54:31.000000000 -0400
-+++ glibc-2.9/iconvdata/Makefile	2009-03-15 19:22:15.753163155 -0400
-@@ -320,23 +320,25 @@
- 
- headers: $(addprefix $(objpfx), $(generated-modules:=.h))
- 
-+ifeq ($(cross-compiling),no)
-+iconvconfig-cmd = LC_ALL=C LANGUAGE=C \
-+  $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
-+  $(common-objpfx)iconv/iconvconfig
-+else
-+iconvconfig-cmd = LC_ALL=C LANGUAGE=C \
-+  $(common-objpfx)iconv/iconvconfig-native
-+endif
-+
- $(addprefix $(inst_gconvdir)/, $(modules.so)): \
-     $(inst_gconvdir)/%: $(objpfx)% $(+force)
- 	$(do-install-program)
- $(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
- 	$(do-install)
--ifeq (no,$(cross-compiling))
- # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
- # if this libc has more gconv modules than the previously installed one.
- 	if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
--	   LC_ALL=C LANGUAGE=C \
--	   $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
--	   $(common-objpfx)iconv/iconvconfig \
--	     $(addprefix --prefix=,$(install_root)); \
-+	   $(iconvconfig-cmd) $(addprefix --prefix=,$(install_root)); \
- 	fi
--else
--	@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
--endif
- 
- endif # build-shared = yes
- 
-diff -Naur glibc-2.9.orig/iconvdata/Makefile.orig glibc-2.9/iconvdata/Makefile.orig
---- glibc-2.9.orig/iconvdata/Makefile.orig	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/iconvdata/Makefile.orig	2008-05-14 21:54:31.000000000 -0400
-@@ -0,0 +1,393 @@
-+# Copyright (C) 1997-2004,2005,2006,2007,2008 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, write to the Free
-+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+# 02111-1307 USA.
-+
-+#
-+#	Makefile for iconv data and code.
-+#
-+subdir	:= iconvdata
-+
-+# Names of all the shared objects which implement the transformations.
-+modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
-+	   ISO8859-6 ISO8859-7 ISO8859-8 ISO8859-9 ISO8859-10		 \
-+	   ISO8859-11 ISO8859-13 ISO8859-14 ISO8859-15 ISO8859-16	 \
-+	   T.61 ISO_6937 SJIS KOI-8 HP-ROMAN8 HP-ROMAN9 EBCDIC-AT-DE	 \
-+	   EBCDIC-AT-DE-A EBCDIC-CA-FR EUC-KR UHC JOHAB libJIS libKSC	 \
-+	   BIG5 EUC-JP libGB EUC-CN libCNS EUC-TW ISO646 EBCDIC-DK-NO	 \
-+	   EBCDIC-DK-NO-A EBCDIC-ES EBCDIC-ES-A EBCDIC-ES-S EBCDIC-FI-SE \
-+	   EBCDIC-FI-SE-A EBCDIC-FR EBCDIC-IS-FRISS EBCDIC-IT EBCDIC-PT	 \
-+	   EBCDIC-UK EBCDIC-US IBM037 IBM038 IBM274 IBM275 IBM423	 \
-+	   IBM500 IBM870 IBM871 IBM891 IBM903 IBM904 IBM905 IBM1047	 \
-+	   IBM874 CP737 CP775 ISO-2022-KR HP-TURKISH8 HP-THAI8 HP-GREEK8 \
-+	   KOI8-R LATIN-GREEK LATIN-GREEK-1 IBM256 IBM273 IBM277 IBM278	 \
-+	   IBM280 IBM281 IBM284 IBM285 IBM290 IBM297 IBM420 IBM424	 \
-+	   IBM437 IBM850 IBM851 IBM852 IBM855 IBM857 IBM860 IBM861	 \
-+	   IBM862 IBM863 IBM864 IBM865 IBM868 IBM869 IBM875 IBM880	 \
-+	   IBM866 CP1258 IBM922 IBM1124 IBM1129 IBM932 IBM943		 \
-+	   IBM856 IBM930 IBM933 IBM935 IBM937 IBM939 IBM1046		 \
-+	   IBM1132 IBM1133 IBM1160 IBM1161 IBM1162 IBM1163 IBM1164	 \
-+	   IBM918 IBM1004 IBM1026 CP1125 CP1250 CP1251 CP1252 CP1253	 \
-+	   CP1254 CP1255 CP1256 CP1257 ISO-2022-JP MACINTOSH IEC_P27-1	 \
-+	   ASMO_449 ANSI_X3.110 CSN_369103 CWI DEC-MCS ECMA-CYRILLIC	 \
-+	   GOST_19768-74 GREEK-CCITT GREEK7 GREEK7-OLD INIS INIS-8	 \
-+	   INIS-CYRILLIC ISO_6937-2 ISO_2033 ISO_5427 ISO_5427-EXT	 \
-+	   ISO_5428 ISO_10367-BOX MAC-IS MAC-UK NATS-DANO NATS-SEFI	 \
-+	   SAMI-WS2 ISO-IR-197 TIS-620 KOI8-U GBK ISIRI-3342 GBGBK	 \
-+	   ISO-2022-CN libISOIR165 UTF-16 UNICODE UTF-32 UTF-7 BIG5HKSCS \
-+	   GB18030 ISO-2022-CN-EXT VISCII GBBIG5 CP10007 KOI8-T		 \
-+	   GEORGIAN-PS GEORGIAN-ACADEMY ISO-IR-209 MAC-SAMI ARMSCII-8	 \
-+	   TCVN5712-1 libJISX0213 EUC-JISX0213 SHIFT_JISX0213		 \
-+	   ISO-2022-JP-3 TSCII IBM866NAV CP932 EUC-JP-MS PT154 RK1048	 \
-+	   IBM1025 IBM1122 IBM1137 IBM1153 IBM1154 IBM1155 IBM1156	 \
-+	   IBM1157 IBM1158 IBM803 IBM901 IBM902 IBM921 IBM1008 		 \
-+	   IBM1008_420 IBM1097 IBM1112 IBM1123 IBM1130 IBM1140 IBM1141 	 \
-+	   IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 	 \
-+	   IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 	 \
-+	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
-+	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF	 \
-+	   MAC-CENTRALEUROPE KOI8-RU ISO8859-9E
-+
-+modules.so := $(addsuffix .so, $(modules))
-+
-+include ../Makeconfig
-+
-+ifeq (yes,$(build-shared))
-+tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
-+	tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7
-+ifeq ($(have-thread-library),yes)
-+tests += bug-iconv3
-+endif
-+
-+test-srcs := tst-table-from tst-table-to
-+
-+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
-+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
-+endif
-+
-+# No code here is in libc.so.
-+CPPFLAGS += -DNOT_IN_libc
-+
-+libJIS-routines := jis0201 jis0208 jis0212
-+libKSC-routines := ksc5601
-+libGB-routines := gb2312
-+libCNS-routines := cns11643l1 cns11643
-+libISOIR165-routines := iso-ir-165
-+libJISX0213-routines := jisx0213
-+
-+LDFLAGS-EUC-KR.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-KR.so: $(objpfx)libKSC.so
-+LDFLAGS-JOHAB.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)JOHAB.so: $(objpfx)libKSC.so
-+LDFLAGS-UHC.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)UHC.so: $(objpfx)libKSC.so
-+LDFLAGS-EUC-JP.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JP.so: $(objpfx)libJIS.so
-+LDFLAGS-EUC-JP-MS.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JP-MS.so: $(objpfx)libJIS.so
-+LDFLAGS-EUC-CN.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-CN.so: $(objpfx)libGB.so
-+LDFLAGS-EUC-TW.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-TW.so: $(objpfx)libCNS.so
-+LDFLAGS-EUC-JISX0213.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)EUC-JISX0213.so: $(objpfx)libJISX0213.so
-+LDFLAGS-SHIFT_JISX0213.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)SHIFT_JISX0213.so: $(objpfx)libJISX0213.so
-+
-+LDFLAGS-ISO-2022-JP.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-JP.so: $(objpfx)libJIS.so $(objpfx)libGB.so \
-+			 $(objpfx)libCNS.so $(objpfx)libKSC.so
-+LDFLAGS-ISO-2022-JP-3.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-JP-3.so: $(objpfx)libJIS.so $(objpfx)libJISX0213.so
-+LDFLAGS-ISO-2022-KR.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-KR.so: $(objpfx)libKSC.so
-+LDFLAGS-ISO-2022-CN.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-CN.so: $(objpfx)libGB.so $(objpfx)libCNS.so
-+LDFLAGS-ISO-2022-CN-EXT.so = $(LDFLAGS-rpath-ORIGIN)
-+$(objpfx)ISO-2022-CN-EXT.so: $(objpfx)libGB.so $(objpfx)libCNS.so \
-+			     $(objpfx)libISOIR165.so
-+
-+LDFLAGS-libJIS.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libKSC.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libGB.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libCNS.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libISOIR165.so = $(LDFLAGS-soname-fname)
-+LDFLAGS-libJISX0213.so = $(LDFLAGS-soname-fname)
-+
-+distribute := gconv-modules extra-module.mk gap.awk gaptab.awk gconv.map    \
-+	      gen-8bit.sh gen-8bit-gap.sh gen-8bit-gap-1.sh		    \
-+	      TESTS $(filter-out testdata/CVS%, $(wildcard testdata/*))	    \
-+	      TESTS2 run-iconv-test.sh tst-tables.sh tst-table.sh	    \
-+	      tst-table-charmap.sh tst-table-from.c tst-table-to.c	    \
-+	      EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
-+	      EUC-KR.irreversible BIG5HKSCS.irreversible BIG5.irreversible  \
-+	      CP1255.irreversible CP1258.irreversible EUC-TW.irreversible   \
-+	      IBM856.irreversible IBM922.irreversible IBM1132.irreversible  \
-+	      IBM1133.irreversible IBM1160.irreversible IBM1161.irreversible\
-+	      IBM1163.irreversible IBM1164.irreversible			    \
-+	      ARMSCII-8.irreversible TCVN5712-1.precomposed		    \
-+	      JISX0213.TXT EUC-JISX0213.precomposed			    \
-+	      SHIFT_JISX0213.precomposed SHIFT_JISX0213.irreversible	    \
-+	      TSCII.irreversible TSCII.precomposed			    \
-+	      8bit-generic.c 8bit-gap.c					    \
-+	      ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h		    \
-+	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
-+	      cns11643l1.c cns11643l1.h cp1125.c cp1250.c cp1251.c cp1252.c \
-+	      cp1253.c cp1254.c cp1255.c cp1256.c cp1257.c cp1258.c	    \
-+	      csn_369103.c cwi.c dec-mcs.c ebcdic-at-de.c ebcdic-at-de-a.c  \
-+	      ebcdic-ca-fr.c ebcdic-dk-no.c ebcdic-dk-no-a.c ebcdic-es.c    \
-+	      ebcdic-es-a.c ebcdic-es-s.c ebcdic-fr.c ebcdic-fi-se.c	    \
-+	      ebcdic-fi-se-a.c ebcdic-is-friss.c ebcdic-it.c ebcdic-pt.c    \
-+	      ebcdic-uk.c ebcdic-us.c ecma-cyrillic.c euc-cn.c euc-jp.c	    \
-+	      euc-kr.c euc-tw.c gb2312.c gb2312.h gbk.c gost_19768-74.c	    \
-+	      greek-ccitt.c greek7.c greek7-old.c hp-roman8.c ibm037.c	    \
-+	      ibm038.c ibm256.c ibm273.c ibm274.c ibm275.c ibm277.c	    \
-+	      ibm278.c ibm280.c ibm281.c ibm284.c ibm285.c ibm290.c	    \
-+	      ibm297.c ibm420.c ibm423.c ibm424.c ibm437.c ibm500.c	    \
-+	      ibm850.c ibm851.c ibm852.c ibm855.c ibm857.c ibm860.c	    \
-+	      ibm861.c ibm862.c ibm863.c ibm864.c ibm865.c ibm866.c	    \
-+	      ibm868.c ibm869.c ibm870.c ibm871.c ibm875.c ibm880.c	    \
-+	      ibm891.c ibm903.c ibm904.c ibm905.c ibm918.c ibm1004.c	    \
-+	      ibm856.c ibm930.c ibm933.c ibm935.c ibm937.c ibm939.c ibm1046.c \
-+	      ibm856.h ibm930.h ibm933.h ibm935.h ibm937.h ibm939.h ibm1046.h \
-+	      ibm922.c ibm922.h ibm1124.c ibm1124.h ibm1129.c ibm1129.h     \
-+	      ibm1132.c ibm1132.h ibm1133.c ibm1133.h ibm1162.c ibm1162.h   \
-+	      ibm1026.c ibm1047.c iec_p27-1.c inis.c inis-8.c viscii.c	    \
-+	      inis-cyrillic.c iso-2022-jp.c iso-2022-kr.c iso646.c	    \
-+	      iso8859-1.c iso8859-2.c iso8859-3.c iso8859-4.c iso8859-5.c   \
-+	      iso8859-6.c iso8859-7.c iso8859-8.c iso8859-9.c iso8859-10.c  \
-+	      iso8859-11.c iso8859-13.c iso8859-14.c iso8859-9e.c	    \
-+	      iso8859-15.c iso_2033.c iso_5427-ext.c iso_5427.c iso_5428.c  \
-+	      iso_6937.c iso_6937-2.c iso_10367-box.c jis0201.c jis0201.h   \
-+	      jis0208.c jis0208.h jis0212.c jis0212.h johab.c koi-8.c	    \
-+	      koi8-r.c ksc5601.c ksc5601.h latin-greek.c latin-greek-1.c    \
-+	      macintosh.c mac-is.c mac-uk.c nats-dano.c nats-sefi.c sjis.c  \
-+	      t.61.c uhc.c sami-ws2.c iso-ir-197.c tis-620.c koi8-u.c	    \
-+	      isiri-3342.c isiri-3342.h gbgbk.c iso-2022-cn.c cns11643l2.h  \
-+	      iso8859-16.c utf-16.c unicode.c utf-32.c utf-7.c big5hkscs.c  \
-+	      iso-ir-165.c iso-ir-165.h gb18030.c iso-2022-cn-ext.c	    \
-+	      ibm932.c ibm932.h ibm943.c ibm943.h gbbig5.c cp10007.c	    \
-+	      koi8-t.c georgian-ps.c georgian-academy.c iso-ir-209.c	    \
-+	      mac-sami.c ibm1160.c ibm1160.h ibm1161.c ibm1161.h	    \
-+	      ibm1163.c ibm1163.h ibm1164.c ibm1164.h jisx0213.c jisx0213.h \
-+	      euc-jisx0213.c shift_jisx0213.c iso-2022-jp-3.c		    \
-+	      tcvn5712-1.c armscii-8.c tscii.c ibm866nav.c pt154.c rk1048.c \
-+	      ibm1025.c ibm1025.h ibm1122.c ibm1122.h ibm1137.c ibm1137.h   \
-+	      ibm1153.c ibm1153.h ibm1154.c ibm1154.h ibm1155.c ibm1155.h   \
-+	      ibm1156.c ibm1156.h ibm1157.c ibm1157.h ibm1158.c ibm1158.h   \
-+	      ibm803.c ibm803.h ibm901.c ibm901.h ibm902.c ibm902.h	    \
-+	      ibm921.c ibm921.h ibm1008.c ibm1008.h ibm1008_420.c	    \
-+	      ibm1097.c ibm1097.h ibm1112.c ibm1112.h ibm1123.c ibm1123.h   \
-+	      ibm1130.c ibm1130.h ibm1140.c ibm1140.h ibm1141.c ibm1141.h   \
-+	      ibm1142.c ibm1142.h ibm1143.c ibm1143.h ibm1144.c ibm1144.h   \
-+	      ibm1145.c ibm1145.h ibm1146.c ibm1146.h ibm1147.c ibm1147.h   \
-+	      ibm1148.c ibm1148.h ibm1149.c ibm1149.h ibm1166.c ibm1166.h   \
-+	      ibm1167.c ibm1167.h ibm4517.c ibm4517.h ibm4899.c ibm4899.h   \
-+	      ibm4909.c ibm4909.h ibm4971.c ibm4971.h ibm5347.c ibm5347.h   \
-+	      ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h   \
-+	      ibm12712.c ibm12712.h ibm16804.c ibm16804.h                   \
-+	      ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h   \
-+	      ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c   \
-+	      brf.c mac-centraleurope.c hp-roman9.c hp-turkish8.c	    \
-+	      hp-thai8.c hp-greek8.c
-+
-+# We build the transformation modules only when we build shared libs.
-+ifeq (yes,$(build-shared))
-+
-+# Rule to generate the shared objects.
-+charmaps = ../localedata/charmaps
-+-include $(objpfx)iconv-rules
-+extra-modules-left := $(modules)
-+include extra-module.mk
-+
-+
-+extra-objs	+= $(modules.so)
-+install-others	= $(addprefix $(inst_gconvdir)/, $(modules.so))	\
-+		  $(inst_gconvdir)/gconv-modules
-+
-+# We can build the conversion tables for numerous charsets automatically.
-+
-+gen-8bit-modules := iso8859-2 iso8859-3 iso8859-4 iso8859-6 iso8859-9 koi-8 \
-+		    ebcdic-at-de ebcdic-at-de-a ebcdic-ca-fr ebcdic-dk-no   \
-+		    ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
-+		    ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
-+		    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
-+		    ibm891 ibm903 ibm904 ibm905 ibm1047   \
-+
-+gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273	   \
-+			ibm277 ibm278 ibm280 ibm281 ibm284 ibm285 ibm290   \
-+			ibm297 ibm420 ibm424 ibm437 ibm850 ibm851 ibm852   \
-+			ibm855 ibm857 ibm860 ibm861 ibm862 ibm863 ibm864   \
-+			ibm865 ibm868 ibm869 ibm875 ibm880 ibm918 ibm1004  \
-+			ibm1026 cp1125 cp1250 cp1251 cp1252 cp1253 cp1254  \
-+			cp1256 cp1257 ibm866 iso8859-5 iso8859-7 iso8859-8 \
-+			iso8859-10 macintosh iec_p27-1 asmo_449		   \
-+			csn_369103 cwi dec-mcs ecma-cyrillic gost_19768-74 \
-+			greek-ccitt greek7 greek7-old inis inis-8	   \
-+			inis-cyrillic iso_2033 iso_5427 iso_5427-ext	   \
-+			iso_5428 iso_10367-box mac-is nats-dano nats-sefi  \
-+			iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2   \
-+			iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t	   \
-+			georgian-ps georgian-academy iso-ir-209 mac-sami   \
-+			iso8859-11 ibm866nav pt154 rk1048 mik brf	   \
-+			mac-centraleurope koi8-ru hp-roman8 hp-roman9	   \
-+			ebcdic-es ebcdic-es-a ebcdic-is-friss ebcdic-uk    \
-+			iso8859-16 viscii iso8859-9e hp-turkish8	   \
-+			hp-thai8 hp-greek8
-+
-+gen-special-modules := iso8859-7jp
-+
-+generated-modules := $(gen-8bit-modules) $(gen-8bit-gap-modules) \
-+		     $(gen-special-modules)
-+
-+generated = $(generated-modules:=.h) $(generated-modules:=.stmp) \
-+	    iconv-test.out iconv-rules tst-loading.mtrace	 \
-+	    mtrace-tst-loading tst-tables.out iconv-test.xxx
-+ifdef objpfx
-+generated += gconv-modules
-+endif
-+
-+# Rules to generate the headers.
-+export AWK
-+
-+define generate-8bit-table
-+$(make-target-directory)
-+LC_ALL=C $(SHELL) ./gen-8bit.sh $< > $(@:stmp=T)
-+$(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+touch $@
-+endef
-+
-+define generate-8bit-gap-table
-+$(make-target-directory)
-+LC_ALL=C $(SHELL) ./gen-8bit-gap.sh $< > $(@:stmp=T)
-+$(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+touch $@
-+endef
-+
-+# The headers must be generated before the compilation.
-+before-compile = $(addprefix $(objpfx),$(generated-modules:=.h))
-+
-+ifndef avoid-generated
-+$(objpfx)iconv-rules: Makefile
-+	$(make-target-directory)
-+	{ echo $(filter-out lib%, $(modules)); \
-+	  echo 8bit $(gen-8bit-modules); \
-+	  echo 8bit-gap $(gen-8bit-gap-modules); } | \
-+	$(AWK) 'NR == 1 { \
-+		  for (i = 1; i <= NF; i++) { \
-+		    printf "%s-routines := %s\n", $$i, tolower($$i); \
-+		    printf "%s-map := gconv.map\n", $$i; \
-+		  } \
-+		}; \
-+		NR > 1 { \
-+		  for (i = 2; i <= NF; i++) { \
-+		    printf "$$(objpfx)%s.stmp: ", $$i; \
-+		    map = toupper($$i); \
-+		    sub(/^ISO8859/, "ISO-8859", map); \
-+		    if (map == "ISO_2033") map = map "-1983"; \
-+		    printf "$$(charmaps)/%s ", map; \
-+		    printf "gen-%s.sh\n", $$1; \
-+		    printf "\t$$(generate-%s-table)\n", $$1; \
-+		  } \
-+		}' > $@.new
-+	mv -f $@.new $@
-+endif
-+
-+$(generated-modules:%=$(objpfx)%.h): $(objpfx)%.h: $(objpfx)%.stmp
-+	@:
-+
-+$(gen-8bit-modules:%=$(objpfx)%.stmp): $(objpfx)%.stmp: $(objpfx)iconv-rules
-+$(gen-8bit-gap-modules:%=$(objpfx)%.stmp): $(objpfx)%.stmp: $(objpfx)iconv-rules
-+
-+$(objpfx)iso8859-7jp.stmp: $(charmaps)/ISO-8859-7 gen-8bit-gap-1.sh
-+	$(make-target-directory)
-+	LC_ALL=C $(SHELL) ./gen-8bit-gap-1.sh $< > $(@:stmp=T)
-+	$(move-if-change) $(@:stmp=T) $(@:stmp=h)
-+	touch $@
-+
-+headers: $(addprefix $(objpfx), $(generated-modules:=.h))
-+
-+$(addprefix $(inst_gconvdir)/, $(modules.so)): \
-+    $(inst_gconvdir)/%: $(objpfx)% $(+force)
-+	$(do-install-program)
-+$(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
-+	$(do-install)
-+ifeq (no,$(cross-compiling))
-+# Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
-+# if this libc has more gconv modules than the previously installed one.
-+	if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
-+	   LC_ALL=C LANGUAGE=C \
-+	   $(common-objpfx)elf/ld.so --library-path $(rpath-link) \
-+	   $(common-objpfx)iconv/iconvconfig \
-+	     $(addprefix --prefix=,$(install_root)); \
-+	fi
-+else
-+	@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
-+endif
-+
-+endif # build-shared = yes
-+
-+include ../Rules
-+
-+ifeq (no,$(cross-compiling))
-+ifeq (yes,$(build-shared))
-+tests: $(objpfx)iconv-test.out $(objpfx)tst-tables.out
-+ifneq (no,$(PERL))
-+tests: $(objpfx)mtrace-tst-loading
-+endif
-+endif
-+endif
-+
-+tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
-+$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
-+	$(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
-+
-+$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv2.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv3: $(libdl)
-+$(objpfx)bug-iconv3.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)bug-iconv5.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-loading.out: $(objpfx)gconv-modules \
-+			  $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-iconv4.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+$(objpfx)tst-iconv7.out: $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so))
-+
-+$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so)) \
-+			 $(common-objdir)/iconv/iconv_prog TESTS
-+	$(SHELL) -e $< $(common-objdir) > $@
-+
-+$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
-+			 $(addprefix $(objpfx),$(modules.so)) \
-+			 $(objpfx)tst-table-from $(objpfx)tst-table-to
-+	$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ > $@
-+
-+do-tests-clean common-mostlyclean: tst-tables-clean
-+
-+.PHONY: tst-tables-clean
-+tst-tables-clean:
-+	-rm -f $(objpfx)tst-*.table $(objpfx)tst-EUC-TW.irreversible
-+
-+ifdef objpfx
-+$(objpfx)gconv-modules: gconv-modules
-+	cp $^ $@
-+endif
-diff -Naur glibc-2.9.orig/include-native/bits/libc-tsd.h glibc-2.9/include-native/bits/libc-tsd.h
---- glibc-2.9.orig/include-native/bits/libc-tsd.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/bits/libc-tsd.h	2009-03-15 19:22:15.788787576 -0400
-@@ -0,0 +1,3 @@
-+#ifndef __libc_tsd_define
-+#define __libc_tsd_define(A,B,C)
-+#endif
-diff -Naur glibc-2.9.orig/include-native/config.h glibc-2.9/include-native/config.h
---- glibc-2.9.orig/include-native/config.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/config.h	2009-03-15 19:22:15.809829790 -0400
-@@ -0,0 +1 @@
-+/* Empty */
-diff -Naur glibc-2.9.orig/include-native/gnu/stubs.h glibc-2.9/include-native/gnu/stubs.h
---- glibc-2.9.orig/include-native/gnu/stubs.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/gnu/stubs.h	2009-03-15 19:22:15.809829790 -0400
-@@ -0,0 +1 @@
-+/* Empty */
-diff -Naur glibc-2.9.orig/include-native/intl/loadinfo.h glibc-2.9/include-native/intl/loadinfo.h
---- glibc-2.9.orig/include-native/intl/loadinfo.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/intl/loadinfo.h	2009-03-15 19:22:15.809829790 -0400
-@@ -0,0 +1,4 @@
-+#ifndef LOADINFO_H
-+#define LOADINFO_H
-+struct loaded_l10nfile;
-+#endif
-diff -Naur glibc-2.9.orig/include-native/libintl.h glibc-2.9/include-native/libintl.h
---- glibc-2.9.orig/include-native/libintl.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/libintl.h	2009-03-15 19:22:15.838789367 -0400
-@@ -0,0 +1,13 @@
-+#include_next <libintl.h>
-+
-+#ifndef _
-+#define _(X) (X)
-+#endif
-+
-+#ifndef N_
-+#define N_(X) (X)
-+#endif
-+
-+#ifndef _libc_intl_domainname
-+#define _libc_intl_domainname "libc"
-+#endif
-diff -Naur glibc-2.9.orig/include-native/symbol-hacks.h glibc-2.9/include-native/symbol-hacks.h
---- glibc-2.9.orig/include-native/symbol-hacks.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/symbol-hacks.h	2009-03-15 19:22:15.838789367 -0400
-@@ -0,0 +1 @@
-+/* Empty */
-diff -Naur glibc-2.9.orig/include-native/tls.h glibc-2.9/include-native/tls.h
---- glibc-2.9.orig/include-native/tls.h	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/include-native/tls.h	2009-03-15 19:22:15.838789367 -0400
-@@ -0,0 +1,11 @@
-+#ifndef _include_tls_h
-+#define _include_tls_h 1
-+
-+#if USE_TLS && HAVE___THREAD \
-+    && (!defined NOT_IN_libc || defined IS_IN_libpthread)
-+# define USE___THREAD 1
-+#else
-+# define USE___THREAD 0
-+#endif
-+
-+#endif
-diff -Naur glibc-2.9.orig/locale/Makefile glibc-2.9/locale/Makefile
---- glibc-2.9.orig/locale/Makefile	2005-12-20 01:58:41.000000000 -0500
-+++ glibc-2.9/locale/Makefile	2009-03-15 19:22:15.838789367 -0400
-@@ -44,6 +44,9 @@
- aux		= $(categories:%=lc-%) $(categories:%=C-%) SYS_libc C_name \
- 		  xlocale localename global-locale coll-lookup
- others		= localedef locale
-+ifneq ($(cross-compiling),no)
-+others-native	= localedef-native
-+endif
- #others-static	= localedef locale
- install-bin	= localedef locale
- extra-objs	= $(localedef-modules:=.o) $(localedef-aux:=.o) \
-@@ -81,6 +84,12 @@
- $(objpfx)locale: $(locale-modules:%=$(objpfx)%.o)
- $(objpfx)localedef $(objpfx)locale: $(lib-modules:%=$(objpfx)%.o)
- 
-+ifneq ($(cross-compiling),no)
-+$(objpfx)localedef-native: $(localedef-modules:%=$(objpfx)%-native.o)
-+$(objpfx)localedef-native: $(localedef-aux:%=$(objpfx)%-native.o)
-+$(objpfx)localedef-native: $(lib-modules:%=$(objpfx)%-native.o)
-+endif
-+
- C-translit.h: C-translit.h.in gen-translit.pl
- 	$(PERL) gen-translit.pl < $< > $@.tmp
- 	mv -f $@.tmp $@
-diff -Naur glibc-2.9.orig/localedata/Makefile glibc-2.9/localedata/Makefile
---- glibc-2.9.orig/localedata/Makefile	2008-11-27 19:05:08.000000000 -0500
-+++ glibc-2.9/localedata/Makefile	2009-03-15 19:22:15.939718625 -0400
-@@ -208,8 +208,13 @@
- INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
- 
- # Sometimes the whole collection of locale files should be installed.
-+ifeq ($(cross-compiling),no)
- LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
- $(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
-+else
-+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-+$(common-objpfx)locale/localedef-native
-+endif
- install-locales: $(INSTALL-SUPPORTED-LOCALES)
- 
- install-locales-dir:
-diff -Naur glibc-2.9.orig/localedata/Makefile.orig glibc-2.9/localedata/Makefile.orig
---- glibc-2.9.orig/localedata/Makefile.orig	1969-12-31 19:00:00.000000000 -0500
-+++ glibc-2.9/localedata/Makefile.orig	2008-11-27 19:05:08.000000000 -0500
-@@ -0,0 +1,300 @@
-+# Copyright (C) 1996-2003, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# This file is part of the GNU C Library.
-+
-+# The GNU C Library is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU Lesser General Public
-+# License as published by the Free Software Foundation; either
-+# version 2.1 of the License, or (at your option) any later version.
-+
-+# The GNU C Library is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# Lesser General Public License for more details.
-+
-+# You should have received a copy of the GNU Lesser General Public
-+# License along with the GNU C Library; if not, write to the Free
-+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+# 02111-1307 USA.
-+
-+# Makefile for installing locale data source files.
-+
-+subdir := localedata
-+
-+all: # Make this the default target; it will be defined in Rules.
-+
-+# List with all available character set descriptions.
-+charmaps := $(filter-out $(addprefix charmaps/, CVS RCS SCCS %~), \
-+				     $(wildcard charmaps/[A-I]*) \
-+				     $(wildcard charmaps/[J-Z]*))
-+
-+# List with all available character set descriptions.
-+locales := $(filter-out $(addprefix locales/, CVS RCS SCCS %~), \
-+				    $(wildcard locales/*))
-+
-+
-+subdir-dirs = tests-mbwc
-+vpath %.c tests-mbwc
-+vpath %.h tests-mbwc
-+
-+
-+test-srcs := collate-test xfrm-test tst-fmon tst-rpmatch tst-trans \
-+	     tst-mbswcs1 tst-mbswcs2 tst-mbswcs3 tst-mbswcs4 tst-mbswcs5 \
-+	     tst-ctype tst-wctype tst-langinfo tst-numeric
-+test-input := de_DE.ISO-8859-1 en_US.ISO-8859-1 da_DK.ISO-8859-1 \
-+	      hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 tr_TR.UTF-8 fr_FR.UTF-8 \
-+	      si_LK.UTF-8
-+test-input-data = $(addsuffix .in, $(basename $(test-input)))
-+test-output := $(foreach s, .out .xout, \
-+			 $(addsuffix $s, $(basename $(test-input))))
-+ld-test-names := test1 test2 test3 test4 test5 test6 test7
-+ld-test-srcs := $(addprefix tests/,$(addsuffix .cm,$(ld-test-names)) \
-+				   $(addsuffix .def,$(ld-test-names)) \
-+				   $(addsuffix .ds,test5 test6) \
-+				   test6.c trans.def)
-+
-+fmon-tests = n01y12 n02n40 n10y31 n11y41 n12y11 n20n32 n30y20 n41n00 \
-+	     y01y10 y02n22 y22n42 y30y21 y32n31 y40y00 y42n21
-+
-+generated := $(test-input) $(test-output) sort-test.out tst-locale.out \
-+	     tst-mbswcs.out tst-leaks.mtrace mtrace-tst-leaks
-+generated-dirs := $(ld-test-names) tt_TT de_DE.437			\
-+		  $(addprefix tstfmon_,$(fmon-tests))			\
-+
-+distribute := CHECKSUMS README SUPPORTED ChangeLog			\
-+	      $(charmaps) $(locales)					\
-+	      tst-rpmatch.sh tst-locale.sh tst-fmon.sh sort-test.sh	\
-+	      tst-fmon.data $(test-input-data) $(ld-test-srcs)		\
-+	      th_TH.in cs_CZ.in tst-mbswcs.sh tst-trans.sh tst-ctype.sh \
-+	      tst-ctype-de_DE.ISO-8859-1.in				\
-+	      tst-numeric.sh tst-numeric.data				\
-+	      $(wildcard tests-mbwc/*.[ch])				\
-+	      $(addprefix tst-fmon-locales/tstfmon_,$(fmon-tests))	\
-+	      gen-locale.sh show-ucs-data.c tst-langinfo.sh		\
-+	      tst-wctype.sh tst-wctype.input gen-unicode-ctype.c	\
-+	      dump-ctype.c
-+
-+# Get $(inst_i18ndir) defined.
-+include ../Makeconfig
-+
-+ifeq (no,$(cross-compiling))
-+locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
-+		     tst_iswctype tst_iswdigit tst_iswgraph            \
-+		     tst_iswlower tst_iswprint tst_iswpunct            \
-+		     tst_iswspace tst_iswupper tst_iswxdigit tst_mblen \
-+		     tst_mbrlen tst_mbrtowc tst_mbsrtowcs tst_mbstowcs \
-+		     tst_mbtowc tst_strcoll tst_strfmon tst_strxfrm    \
-+		     tst_swscanf tst_towctrans tst_towlower            \
-+		     tst_towupper tst_wcrtomb tst_wcscat tst_wcschr    \
-+		     tst_wcscmp tst_wcscoll tst_wcscpy tst_wcscspn     \
-+		     tst_wcslen tst_wcsncat tst_wcsncmp tst_wcsncpy    \
-+		     tst_wcspbrk tst_wcsrtombs tst_wcsspn tst_wcsstr   \
-+		     tst_wcstod tst_wcstok tst_wcstombs tst_wcswidth   \
-+		     tst_wcsxfrm tst_wctob tst_wctomb tst_wctrans      \
-+		     tst_wctype tst_wcwidth
-+
-+tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \
-+	tst-leaks tst-mbswcs6 tst-xlocale1 tst-xlocale2 bug-usesetlocale \
-+	tst-strfmon1 tst-sscanf tst-strptime
-+ifeq (yes,$(build-shared))
-+ifneq (no,$(PERL))
-+tests: $(objpfx)mtrace-tst-leaks
-+endif
-+endif
-+endif
-+
-+# Files to install.
-+install-others := $(addprefix $(inst_i18ndir)/, \
-+			      $(addsuffix .gz, $(charmaps)) \
-+			      $(locales))
-+
-+include ../Rules
-+
-+# Install the charmap files in gzipped format.
-+$(inst_i18ndir)/charmaps/%.gz: charmaps/% $(+force)
-+	$(make-target-directory)
-+	rm -f $(@:.gz=) $@
-+	$(INSTALL_DATA) $< $(@:.gz=)
-+	gzip -9 $(@:.gz=)
-+
-+# Install the locale source files in the appropriate directory.
-+$(inst_i18ndir)/locales/%: locales/% $(+force); $(do-install)
-+
-+# gcc does not know all the format specifiers we are using here.
-+CFLAGS-tst-mbswcs1.c = -Wno-format
-+CFLAGS-tst-mbswcs2.c = -Wno-format
-+CFLAGS-tst-mbswcs3.c = -Wno-format
-+CFLAGS-tst-mbswcs4.c = -Wno-format
-+CFLAGS-tst-mbswcs5.c = -Wno-format
-+CFLAGS-tst-trans.c = -Wno-format
-+
-+
-+ifeq (no,$(cross-compiling))
-+# We have to generate locales
-+LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
-+	   en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \
-+	   hr_HR.ISO-8859-2 sv_SE.ISO-8859-1 ja_JP.SJIS fr_FR.ISO-8859-1 \
-+	   vi_VN.TCVN5712-1 nb_NO.ISO-8859-1 nn_NO.ISO-8859-1 \
-+	   tr_TR.UTF-8 cs_CZ.UTF-8 zh_TW.EUC-TW fa_IR.UTF-8 fr_FR.UTF-8 \
-+	   ja_JP.UTF-8 si_LK.UTF-8
-+LOCALE_SRCS := $(shell echo "$(LOCALES)"|sed 's/\([^ .]*\)[^ ]*/\1/g')
-+CHARMAPS := $(shell echo "$(LOCALES)" | \
-+		    sed -e 's/[^ .]*[.]\([^ ]*\)/\1/g' -e s/SJIS/SHIFT_JIS/g)
-+CTYPE_FILES = $(addsuffix /LC_CTYPE,$(LOCALES))
-+
-+generated-dirs += $(LOCALES)
-+
-+# Dependency for the locale files.  We actually make it depend only on
-+# one of the files.
-+$(addprefix $(objpfx),$(CTYPE_FILES)): %: \
-+  gen-locale.sh $(common-objpfx)locale/localedef Makefile \
-+  $(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))
-+	@$(SHELL) -e gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@
-+
-+$(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \
-+  $(addprefix $(objpfx),$(CTYPE_FILES))
-+
-+tests: $(objpfx)sort-test.out $(objpfx)tst-fmon.out $(objpfx)tst-locale.out \
-+       $(objpfx)tst-rpmatch.out $(objpfx)tst-trans.out \
-+       $(objpfx)tst-mbswcs.out $(objpfx)tst-ctype.out $(objpfx)tst-wctype.out \
-+       $(objpfx)tst-langinfo.out $(objpfx)tst-numeric.out
-+
-+$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
-+		       $(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' $(test-input) \
-+	  > $@
-+$(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
-+		       $(objpfx)sort-test.out \
-+		       $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-fmon.data \
-+	  > $@
-+$(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
-+		       $(objpfx)sort-test.out \
-+		       $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)' tst-numeric.data \
-+	  > $@
-+$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
-+			 $(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
-+$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
-+			  $(objpfx)tst-fmon.out \
-+			  $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)' > $@
-+$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
-+			$(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
-+$(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
-+			 $(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
-+			 $(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
-+			 $(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(run-program-prefix)'
-+$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
-+			$(objpfx)sort-test.out \
-+			$(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
-+$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
-+			$(objpfx)sort-test.out tst-wctype.input \
-+			$(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
-+$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
-+			$(objpfx)sort-test.out \
-+			$(addprefix $(objpfx),$(CTYPE_FILES))
-+	$(SHELL) -e $< $(common-objpfx) '$(built-program-cmd)'
-+$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
-+$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
-+endif
-+
-+include SUPPORTED
-+
-+INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES))
-+
-+# Sometimes the whole collection of locale files should be installed.
-+LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-+$(common-objpfx)elf/ld.so --library-path $(rpath-link) $(common-objpfx)locale/localedef
-+install-locales: $(INSTALL-SUPPORTED-LOCALES)
-+
-+install-locales-dir:
-+	$(..)./scripts/mkinstalldirs $(inst_localedir)
-+
-+$(INSTALL-SUPPORTED-LOCALES): install-locales-dir
-+	@locale=`echo $@ | sed -e 's/^install-//'`; \
-+	charset=`echo $$locale | sed -e 's,.*/,,'`; \
-+	locale=`echo $$locale | sed -e 's,/[^/]*,,'`; \
-+	echo -n `echo $$locale | sed 's/\([^.\@]*\).*/\1/'`; \
-+	echo -n ".$$charset"; \
-+	echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
-+	echo -n '...'; \
-+	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
-+	$(LOCALEDEF) --alias-file=../intl/locale.alias \
-+		     -i locales/$$input -c -f charmaps/$$charset \
-+		     $(addprefix --prefix=,$(install_root)) $$locale; \
-+	echo ' done'; \
-+
-+# The mbwc-tests need some environment setup to find the locale data files
-+TEST_MBWC_ENV:= LOCPATH=$(common-objpfx)localedata
-+tst_iswalnum-ENV = $(TEST_MBWC_ENV)
-+tst_iswalpha-ENV = $(TEST_MBWC_ENV)
-+tst_iswcntrl-ENV = $(TEST_MBWC_ENV)
-+tst_iswctype-ENV = $(TEST_MBWC_ENV)
-+tst_iswdigit-ENV = $(TEST_MBWC_ENV)
-+tst_iswgraph-ENV = $(TEST_MBWC_ENV)
-+tst_iswlower-ENV = $(TEST_MBWC_ENV)
-+tst_iswprint-ENV = $(TEST_MBWC_ENV)
-+tst_iswpunct-ENV = $(TEST_MBWC_ENV)
-+tst_iswspace-ENV = $(TEST_MBWC_ENV)
-+tst_iswupper-ENV = $(TEST_MBWC_ENV)
-+tst_iswxdigit-ENV = $(TEST_MBWC_ENV)
-+tst_mblen-ENV = $(TEST_MBWC_ENV)
-+tst_mbrlen-ENV = $(TEST_MBWC_ENV)
-+tst_mbrtowc-ENV = $(TEST_MBWC_ENV)
-+tst_mbsrtowcs-ENV = $(TEST_MBWC_ENV)
-+tst_mbstowcs-ENV = $(TEST_MBWC_ENV)
-+tst_mbtowc-ENV = $(TEST_MBWC_ENV)
-+tst_strcoll-ENV = $(TEST_MBWC_ENV)
-+tst_strfmon-ENV = $(TEST_MBWC_ENV)
-+tst_strxfrm-ENV = $(TEST_MBWC_ENV)
-+tst_swscanf-ENV = $(TEST_MBWC_ENV)
-+tst_towctrans-ENV = $(TEST_MBWC_ENV)
-+tst_towlower-ENV = $(TEST_MBWC_ENV)
-+tst_towupper-ENV = $(TEST_MBWC_ENV)
-+tst_wcrtomb-ENV = $(TEST_MBWC_ENV)
-+tst_wcscat-ENV = $(TEST_MBWC_ENV)
-+tst_wcschr-ENV = $(TEST_MBWC_ENV)
-+tst_wcscmp-ENV = $(TEST_MBWC_ENV)
-+tst_wcscoll-ENV = $(TEST_MBWC_ENV)
-+tst_wcscpy-ENV = $(TEST_MBWC_ENV)
-+tst_wcscspn-ENV = $(TEST_MBWC_ENV)
-+tst_wcslen-ENV = $(TEST_MBWC_ENV)
-+tst_wcsncat-ENV = $(TEST_MBWC_ENV)
-+tst_wcsncmp-ENV = $(TEST_MBWC_ENV)
-+tst_wcsncpy-ENV = $(TEST_MBWC_ENV)
-+tst_wcspbrk-ENV = $(TEST_MBWC_ENV)
-+tst_wcsrtombs-ENV = $(TEST_MBWC_ENV)
-+tst_wcsspn-ENV = $(TEST_MBWC_ENV)
-+tst_wcsstr-ENV = $(TEST_MBWC_ENV)
-+tst_wcstod-ENV = $(TEST_MBWC_ENV)
-+tst_wcstok-ENV = $(TEST_MBWC_ENV)
-+tst_wcstombs-ENV = $(TEST_MBWC_ENV)
-+tst_wcswidth-ENV = $(TEST_MBWC_ENV)
-+tst_wcsxfrm-ENV = $(TEST_MBWC_ENV)
-+tst_wctob-ENV = $(TEST_MBWC_ENV)
-+tst_wctomb-ENV = $(TEST_MBWC_ENV)
-+tst_wctrans-ENV = $(TEST_MBWC_ENV)
-+tst_wctype-ENV = $(TEST_MBWC_ENV)
-+tst_wcwidth-ENV = $(TEST_MBWC_ENV)
-+tst-digits-ENV = $(TEST_MBWC_ENV)
-+tst-mbswcs6-ENV = $(TEST_MBWC_ENV)
-+tst-xlocale1-ENV = $(TEST_MBWC_ENV)
-+tst-xlocale2-ENV = $(TEST_MBWC_ENV)
-+tst-strfmon1-ENV = $(TEST_MBWC_ENV)
-+tst-strptime-ENV = $(TEST_MBWC_ENV)
-+
-+tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP
-+
-+bug-iconv-trans-ENV = LOCPATH=$(common-objpfx)localedata
-+
-+tst-sscanf-ENV = LOCPATH=$(common-objpfx)localedata
-+
-+tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
-+		LOCPATH=$(common-objpfx)localedata
-+$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
-+	$(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
-diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
---- glibc-2.9.orig/Makeconfig	2008-08-18 05:42:17.000000000 -0400
-+++ glibc-2.9/Makeconfig	2009-03-15 19:22:15.939718625 -0400
-@@ -446,6 +446,13 @@
- 			   $(common-objpfx)libc% $(+postinit),$^) \
- 	      $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit)
- endif
-+# Command for linking programs against the host system.
-+ifndef +link-native
-++link-native = $(BUILD_CC) -static -g -o $@ $^ \
-+              $(LDFLAGS) $(LDFLAGS-$(@F)) \
-+              $(combreloc-LDFLAGS) $(relro-LDFLAGS) \
-+              $(link-extra-libs)
-+endif
- # Command for statically linking bounded-pointer programs with the C library.
- ifndef +link-bounded
- +link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
-@@ -659,6 +666,8 @@
- 	    $(+sysdep-includes) $(includes) \
- 	    $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
- 
-++includes-native = -I$(..)include-native -I$(objpfx) -I.
-+
- # Since libio has several internal header files, we use a -I instead
- # of many little headers in the include directory.
- libio-include = -I$(..)libio
-@@ -673,10 +682,15 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
-+CPPFLAGS-native = -D_GNU_SOURCE $($(subdir)-CPPFLAGS) $(+includes-native) $(defines) \
-+		  $(CPPFLAGS-$(suffix $@)) -include $(..)include/libc-symbols.h \
-+		  $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
- override CFLAGS	= -std=gnu99 $(gnu89-inline-CFLAGS) \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(+gccwarn-c) \
- 		  $(sysdep-CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) \
- 		  $(CFLAGS-$(@F))
-+override CFLAGS-native = -std=gnu99 $(gnu89-inline-CFLAGS) $(default_cflags) $(+gccwarn-c) \
-+			 $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
- override CXXFLAGS = $(c++-sysincludes) \
- 		    $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
- 		    $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
-diff -Naur glibc-2.9.orig/Makerules glibc-2.9/Makerules
---- glibc-2.9.orig/Makerules	2008-02-06 19:39:18.000000000 -0500
-+++ glibc-2.9/Makerules	2009-03-15 19:22:15.975455420 -0400
-@@ -278,6 +278,9 @@
- object-suffixes-left := $(all-object-suffixes)
- include $(o-iterator)
- 
-+$(objpfx)%-native.o: %.c $(before-compile)
-+	$(native-compile-command.c)
-+
- # Omit the objpfx rules when building in the source tree, because
- # objpfx is empty and so these rules just override the ones above.
- ifdef objpfx
-@@ -354,6 +357,8 @@
- compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags)
- compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
- compile-command.cc = $(compile.cc) $(OUTPUT_OPTION) $(compile-mkdep-flags)
-+# Native commands
-+native-compile-command.c = $(native-compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
- 
- # GCC can grok options after the file name, and it looks nicer that way.
- compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS)
-@@ -363,6 +368,8 @@
- COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \
- 		  $(ASFLAGS) $(ASFLAGS-$(suffix $@))
- COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS)
-+# Native commands
-+native-compile.c = $(BUILD_CC) -g $< -c $(CFLAGS-native) $(CPPFLAGS-native)
- 
- # We need this for the output to go in the right place.  It will default to
- # empty if make was configured to work with a cc that can't grok -c and -o
-@@ -1156,7 +1163,7 @@
- $(make-target-directory)
- $(patsubst %/,cd % &&,$(objpfx)) \
- $(BUILD_CC) $($(basename $(<F))-CFLAGS) $(ALL_BUILD_CFLAGS) \
--	    $(firstword $(filter /%,$< $(shell pwd)/$<)) -o $(@F)
-+	    $(addprefix $(shell pwd)/, $^) -o $(@F)
- endef
- 
- # Command to compile $< in $(common-objdir) using the native libraries.
-diff -Naur glibc-2.9.orig/malloc/Makefile glibc-2.9/malloc/Makefile
---- glibc-2.9.orig/malloc/Makefile	2007-12-16 17:57:50.000000000 -0500
-+++ glibc-2.9/malloc/Makefile	2009-03-15 19:22:15.975455420 -0400
-@@ -73,10 +73,6 @@
- endif
- endif
- 
--# Unless we get a test for the availability of libgd which also works
--# for cross-compiling we disable the memusagestat generation in this
--# situation.
--ifneq ($(cross-compiling),yes)
- # If the gd library is available we build the `memusagestat' program.
- ifneq ($(LIBGD),no)
- others: $(objpfx)memusage
-@@ -91,7 +87,6 @@
- # is to presume that the standard system headers will be ok for this file.
- $(objpfx)memusagestat.o: sysincludes = # nothing
- endif
--endif
- 
- # Another goal which can be used to override the configure decision.
- .PHONY: do-memusagestat
-diff -Naur glibc-2.9.orig/Rules glibc-2.9/Rules
---- glibc-2.9.orig/Rules	2006-02-28 02:05:48.000000000 -0500
-+++ glibc-2.9/Rules	2009-03-15 19:22:15.975455420 -0400
-@@ -87,7 +87,7 @@
- 
- .PHONY: others tests
- ifeq ($(build-programs),yes)
--others: $(addprefix $(objpfx),$(others) $(sysdep-others) $(extra-objs))
-+others: $(addprefix $(objpfx),$(others) $(others-native) $(sysdep-others) $(extra-objs))
- else
- others: $(addprefix $(objpfx),$(extra-objs))
- endif
-@@ -106,9 +106,11 @@
- ifeq ($(build-programs),yes)
- binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs)
- binaries-static = $(others-static) $(tests-static) $(xtests-static)
-+binaries-native = $(others-native)
- else
- binaries-all = $(tests) $(xtests) $(test-srcs)
- binaries-static =
-+binaries-native =
- endif
- 
- binaries-shared = $(filter-out $(binaries-static), $(binaries-all))
-@@ -127,6 +129,11 @@
- 	$(+link-static)
- endif
- 
-+ifneq "$(strip $(binaries-native))" ""
-+$(addprefix $(objpfx),$(binaries-native)): %: %.o
-+	$(+link-native)
-+endif
-+
- ifeq ($(build-bounded),yes)
- binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
- $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
-diff -Naur glibc-2.9.orig/sunrpc/Makefile glibc-2.9/sunrpc/Makefile
---- glibc-2.9.orig/sunrpc/Makefile	2006-10-18 15:25:38.000000000 -0400
-+++ glibc-2.9/sunrpc/Makefile	2009-03-15 19:22:15.975455420 -0400
-@@ -70,6 +70,9 @@
- 	    clnt_unix svc_unix create_xid xdr_intXX_t
- 
- others := rpcinfo
-+ifneq ($(cross-compiling),no)
-+others-native := rpcgen-native
-+endif
- install-bin := rpcgen
- install-sbin := rpcinfo
- rpcgen-objs = rpc_main.o rpc_hout.o rpc_cout.o rpc_parse.o \
-@@ -98,15 +101,12 @@
- 	     $(resolvobjdir)/libresolv.a
- endif
- 
--ifeq (no,$(cross-compiling))
--# We can only build this library if we can run the rpcgen we build.
- headers += $(rpcsvc:%.x=rpcsvc/%.h)
- extra-libs := librpcsvc
- extra-libs-others := librpcsvc # Make it in `others' pass, not `lib' pass.
- librpcsvc-routines = $(rpcsvc:%.x=x%)
- librpcsvc-inhibit-o = .os # Build no shared rpcsvc library.
- omit-deps = $(librpcsvc-routines)
--endif
- 
- CFLAGS-xbootparam_prot.c = -Wno-unused $(PIC-ccflag)
- CFLAGS-xnlm_prot.c = -Wno-unused $(PIC-ccflag)
-@@ -136,13 +136,26 @@
-   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
- 	$(+link)
- 
-+ifneq ($(cross-compiling),no)
-+rpcgen.c:
-+	touch rpcgen.c
-+
-+$(objpfx)rpcgen-native: $(addprefix $(objpfx),$(rpcgen-objs:%.o=%-native.o))
-+endif
-+
- # This makes sure -DNOT_IN_libc is passed for all these modules.
- cpp-srcs-left := $(rpcgen-objs:.o=.c)
- lib := nonlib
- include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
- 
- # Tell rpcgen where to find the C preprocessor.
-+ifeq ($(cross-compiling),no)
- rpcgen-cmd = CPP='$(CC) -E -x c-header' $(built-program-cmd) -Y ../scripts
-+rpcgen = $(objpfx)rpcgen
-+else
-+rpcgen-cmd = CPP='$(CC) -E -x c-header' $(objpfx)rpcgen-native -Y ../scripts
-+rpcgen = $(objpfx)rpcgen-native
-+endif
- 
- # Install the rpc data base file.
- $(inst_sysconfdir)/rpc: etc.rpc $(+force)
-@@ -153,7 +166,7 @@
- # relinked.
- $(rpcsvc:%.x=$(objpfx)rpcsvc/%.h): $(objpfx)rpcsvc/%.h: $(objpfx)rpcsvc/%.stmp
- 	@:
--$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(objpfx)rpcgen
-+$(objpfx)rpcsvc/%.stmp: rpcsvc/%.x $(rpcgen)
- 	$(make-target-directory)
- 	-@rm -f ${@:stmp=T} $@
- 	$(rpcgen-cmd) -h $< -o ${@:stmp=T}
-@@ -163,7 +176,7 @@
- # Generate the rpcsvc XDR functions with rpcgen.
- $(rpcsvc:%.x=$(objpfx)x%.c): $(objpfx)x%.c: $(objpfx)x%.stmp
- 	@:
--$(objpfx)x%.stmp: rpcsvc/%.x $(objpfx)rpcgen
-+$(objpfx)x%.stmp: rpcsvc/%.x $(rpcgen)
- 	-@rm -f ${@:stmp=T} $@
- 	$(rpcgen-cmd) -c $< -o ${@:stmp=T}
- 	$(move-if-change) $(@:stmp=T) $(@:stmp=c)
-diff -Naur glibc-2.9.orig/timezone/Makefile glibc-2.9/timezone/Makefile
---- glibc-2.9.orig/timezone/Makefile	2007-07-28 16:33:11.000000000 -0400
-+++ glibc-2.9/timezone/Makefile	2009-03-15 19:22:16.056496560 -0400
-@@ -28,6 +28,9 @@
- extra-objs := scheck.o ialloc.o
- 
- others	:= zdump zic
-+ifneq ($(cross-compiling),no)
-+others-native := zic-native
-+endif
- tests	:= test-tz tst-timezone
- 
- tzbases := africa antarctica asia australasia europe northamerica \
-@@ -69,13 +72,10 @@
- 					 $(addprefix $(inst_zonedir)/, \
- 						     $(posixrules-file)))
- 
--ifeq ($(cross-compiling),no)
--# Don't try to install the zoneinfo files since we can't run zic.
- install-others = $(addprefix $(inst_zonedir)/,$(zonenames) \
- 					      $(zonenames:%=posix/%) \
- 					      $(zonenames:%=right/%)) \
- 		 $(installed-localtime-file) $(installed-posixrules-file)
--endif
- 
- ifeq ($(have-ksh),yes)
- install-others += $(inst_zonedir)/iso3166.tab $(inst_zonedir)/zone.tab
-@@ -128,7 +128,11 @@
- # We have to use `-d $(inst_zonedir)' to explictly tell zic where to
- # place the output files although $(zonedir) is compiled in.  But the
- # user might have set $(install_root) on the command line of `make install'.
-+ifeq ($(cross-compiling),no)
- zic-cmd = $(built-program-cmd) -d $(inst_zonedir)
-+else
-+zic-cmd = $(common-objpfx)/timezone/zic-native -d $(inst_zonedir)
-+endif
- tzcompile = $(zic-cmd)$(target-zone-flavor) -L $(word 3,$^) \
- 	    -y $(dir $(word 4,$^))$(notdir $(word 4,$^)) $<
- 
-@@ -158,8 +162,10 @@
- 	$(zic-cmd) -p $(posixrules)
- endif
- 
--
- $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
-+ifneq ($(cross-compiling),no)
-+$(objpfx)zic-native:  $(objpfx)scheck-native.o $(objpfx)ialloc-native.o
-+endif
- 
- tz-cflags = -DTZDIR='"$(zonedir)"' \
- 	    -DTZDEFAULT='"$(localtime-file)"' \
Index: tches/glibc-2.9-libgcc_eh-1.patch
===================================================================
--- patches/glibc-2.9-libgcc_eh-1.patch	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,138 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2006-11-09
-Initial Package Version: 2.5
-Origin: Joe Ciccone
-Upstream Status: Unknown
-Description: Checks to see if libgcc_eh has been provided by gcc. If it has
-             the glibc will attempt to link to it.
-
-             Rediffed for 2.7 by Jim Gifford
-             Rediffed for 2.8 by Joe Ciccone
-             Rediffed for 2.9 by Joe Ciccone
-
-diff -Naur glibc-2.9.orig/config.make.in glibc-2.9/config.make.in
---- glibc-2.9.orig/config.make.in	2008-08-18 05:42:17.000000000 -0400
-+++ glibc-2.9/config.make.in	2008-12-17 08:23:59.000000000 -0500
-@@ -60,6 +60,7 @@
- have-libaudit = @have_libaudit@
- have-libcap = @have_libcap@
- have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
-+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
- fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
-diff -Naur glibc-2.9.orig/configure.in glibc-2.9/configure.in
---- glibc-2.9.orig/configure.in	2008-11-27 19:05:05.000000000 -0500
-+++ glibc-2.9/configure.in	2008-12-17 08:21:56.000000000 -0500
-@@ -1394,6 +1394,23 @@
-     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
-   fi
- 
-+  AC_CACHE_CHECK(whether to link against libgcc_eh,
-+                 libc_cv_cc_with_libgcc_eh, [
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*])
-+  AC_SUBST(libc_cv_cc_with_libgcc_eh)
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
-+  fi
-+
-   AC_CACHE_CHECK(for -z nodelete option,
- 		 libc_cv_z_nodelete, [dnl
-   cat > conftest.c <<EOF
-diff -Naur glibc-2.9.orig/configure glibc-2.9/configure
---- glibc-2.9.orig/configure	2008-11-27 19:05:36.000000000 -0500
-+++ glibc-2.9/configure	2008-12-17 08:24:21.000000000 -0500
-@@ -716,6 +716,7 @@
- BISON
- VERSIONING
- libc_cv_cc_with_libunwind
-+libc_cv_cc_with_libgcc_eh
- libc_cv_Bgroup
- libc_cv_libgcc_s_suffix
- libc_cv_as_needed
-@@ -6053,6 +6054,33 @@
- 
-   fi
- 
-+  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
-+echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
-+if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*
-+fi
-+{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
-+echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
-+
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_CC_WITH_LIBGCC_EH 1
-+_ACEOF
-+
-+  fi
-+
-   { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
- echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
- if test "${libc_cv_z_nodelete+set}" = set; then
-@@ -9282,6 +9310,7 @@
- BISON!$BISON$ac_delim
- VERSIONING!$VERSIONING$ac_delim
- libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
-+libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
- libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
- libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
- libc_cv_as_needed!$libc_cv_as_needed$ac_delim
-@@ -9335,7 +9364,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 54; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Naur glibc-2.9.orig/Makeconfig glibc-2.9/Makeconfig
---- glibc-2.9.orig/Makeconfig	2008-08-18 05:42:17.000000000 -0400
-+++ glibc-2.9/Makeconfig	2008-12-17 08:23:42.000000000 -0500
-@@ -525,12 +525,20 @@
-   libunwind = -lunwind
- endif
- ifneq ($(have-as-needed),yes)
-- libgcc_eh := -lgcc_eh $(libunwind)
-+ ifneq ($(have-cc-with-libgcc_eh),yes)
-+  libgcc_eh := $(libunwind)
-+ else
-+  libgcc_eh := -lgcc_eh $(libunwind)
-+ endif
- else
-  libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
- endif
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ static-gnulib := -lgcc $(libunwind)
-+else
-+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+endif
- libc.so-gnulib := -lgcc
- endif
- ifeq ($(elf),yes)
Index: tches/glibc-2.9-localedef_segfault-1.patch
===================================================================
--- patches/glibc-2.9-localedef_segfault-1.patch	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,59 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-05-19
-Initial Package Version: 2.6
-Origin: Debian
-Upstream Status: Unknown
-Description: Fixes Segfault when using localdef.
-             This problem is only noticed when using PaX
-             and some architectures besides x86.
-             See debian bug # 231438
-
-             Rediffed for 2.8 by Joe Ciccone
-             Rediffed for 2.9 by Joe Ciccone
-
-diff -Naur glibc-2.8.orig/locale/programs/3level.h glibc-2.8/locale/programs/3level.h
---- glibc-2.8.orig/locale/programs/3level.h	2007-07-15 20:54:59.000000000 -0400
-+++ glibc-2.8/locale/programs/3level.h	2008-09-20 12:09:34.000000000 -0400
-@@ -203,6 +203,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
Index: tches/glibc-2.9-nptl_lowlevellock-1.patch
===================================================================
--- patches/glibc-2.9-nptl_lowlevellock-1.patch	(revision f3125bffe4f603beddd29856e02ad5b420797826)
+++ 	(revision )
@@ -1,18 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2009-01-03
-Initial Package Version: 2.8
-Origin: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/glibc/2.8/6240_all_glibc-2.8-nptl-lowlevellock.patch?rev=1.1&view=markup
-Upstream Status: Unknown
-Description: Adds a missing include to arm that fixes a compilation problem.
-
-diff -Naur glibc-2.8.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.8/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.8.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2007-09-12 08:57:25.000000000 -0400
-+++ glibc-2.8/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-01-03 18:12:10.042527536 -0500
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
