Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/alpha/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/common/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -39,4 +39,16 @@
     </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="l1">The following sed makes sure that newly built EGLIBC is tested,
+    during make install, instead of the one we previously build:</para>
+
+<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
+  scripts/test-installation.pl
+unset LINKER</userinput></screen>
+
     <para os="b">The EGLIBC build system is self-contained and will install
     perfectly, even though the compiler specs file and linker are still
@@ -81,9 +93,11 @@
     </important>
 
-    <para os="m">Test the results:</para>
+    <para os="m">Before running the tests, copy a file from the source tree into our
+    build tree to prevent a couple of test failures, then run the tests:</para>
 
 <!-- items n,o,p no longer the master, use x86_64 which has no failures -->
 
-<screen os="n"><userinput>make -k check &gt;eglibc-check-log 2&gt;&amp;1 ; grep Error eglibc-check-log</userinput></screen>
+<screen os="n"><userinput>cp -v ../glibc-&eglibc-version;/iconvdata/gconv-modules iconvdata
+make -k check &gt;eglibc-check-log 2&gt;&amp;1 ; grep Error eglibc-check-log</userinput></screen>
 
     <para os="o">The EGLIBC test suite is highly dependent on certain functions of
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/mips/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,20 @@
   <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='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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/eglibc-64bit.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-n32.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/mips64/eglibc-n32.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,21 @@
   <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='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='l1'])"/>
+
+<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib32/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+sed -i "s|libs -o|libs -L/usr/lib32 -Wl,-dynamic-linker=${LINKER} -o|" \
+  scripts/test-installation.pl
+unset LINKER</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/mips64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -26,4 +26,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eglibc-64bit.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,21 @@
   <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='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='l1'])"/>
+
+<screen os="l2"><userinput>LINKER=$(readelf -l $(file /tools/lib64/libc-* | cut -f1 -d:) | sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
+sed -i "s|libs -o|libs -L/usr/lib64 -Wl,-dynamic-linker=${LINKER} -o|" \
+  scripts/test-installation.pl
+unset LINKER</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/multilib/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -26,4 +26,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/ppc/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,20 @@
   <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='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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/eglibc-64bit.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -26,4 +26,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,20 @@
   <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='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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/eglibc-64bit.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/x86/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -25,4 +25,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -21,4 +21,20 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../multilib/eglibc-64bit.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -26,4 +26,20 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='z'])"/>
+
+    <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='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/introduction/common/changelog.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -45,4 +45,7 @@
         <listitem>
           <para>[Jim] - Updated Findutils to 4.4.2.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Updated EGLIBC to prevent most testsuite failures.</para>
         </listitem>
       </itemizedlist>
Index: BOOK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/materials/common/patches.xml	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -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>Expect Avoid TCL Internals Patch - <token>&expect-avoid_tcl_internals-patch-size;</token>:</term>
       <listitem>
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision d06a4e546dfe15db2a0808576242cbf089b370cc)
+++ BOOK/patches.ent	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -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 expect-avoid_tcl_internals-patch "expect-&expect-version;-avoid-tcl-internals-1.patch">
 <!ENTITY expect-avoid_tcl_internals-patch-md5 "5661004ca23ddc9592f488142367c2f5">
Index: patches/eglibc-2.10.1-fixes-1.patch
===================================================================
--- patches/eglibc-2.10.1-fixes-1.patch	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
+++ patches/eglibc-2.10.1-fixes-1.patch	(revision d8f87e8a94db28becd5c776e6f6fa444e316f3df)
@@ -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)"' \
