Index: BOOK/cross-tools/64/eglibc.xml
===================================================================
--- BOOK/cross-tools/64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -29,12 +29,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -61,5 +53,5 @@
       --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
       --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-      --cache-file=config.cache</userinput></screen>
+      --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
@@ -140,12 +132,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/alpha/eglibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc-headers.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/alpha/eglibc-headers.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,21 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <para os="s1">EGLIBC's <filename>configure</filename> script checks the
@@ -83,5 +66,6 @@
    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
    --disable-sanity-checks --enable-kernel=2.6.32 \
-   --with-headers=/tools/include --cache-file=config.cache \
+   --with-headers=/tools/include --enable-obsolete-rpc \
+   --cache-file=config.cache \
    --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
 
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,19 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <para os="g1">ALPHA is not supported in the main EGLIBC tree, so
-    we need the eglibc-ports tarball. Unpack <filename>eglibc-ports-&eglibc-version;-r&eglibc-revision;</filename>:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98,12 +83,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/common/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,9 +26,4 @@
     the method suggested in this book puts the stability of the system at
     risk.</para>
-
-    <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
-
-<screen os="dc"><userinput>cp -v Makeconfig{,.orig}
-sed -e 's/-lgcc_eh//g' Makeconfig.orig > Makeconfig</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -60,5 +55,6 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 \
     --with-__thread --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include --cache-file=config.cache</userinput></screen>
+    --with-headers=/tools/include --enable-obsolete-rpc \
+    --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
@@ -178,12 +174,4 @@
 	installed on the host system</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-<screen os="rb"><userinput>cp -v ../eglibc-&eglibc-version;/sunrpc/rpc/*.h /tools/include/rpc
-cp -v ../eglibc-&eglibc-version;/sunrpc/rpcsvc/*.h /tools/include/rpcsvc
-cp -v ../eglibc-&eglibc-version;/nis/rpcsvc/*.h /tools/include/rpcsvc</userinput></screen>
-
   </sect2>
 
Index: BOOK/cross-tools/mips/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/mips/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,20 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -99,12 +83,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/mips64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/mips64-64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,20 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -107,12 +91,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,20 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -115,12 +99,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/mips64/eglibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-n32.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/mips64/eglibc-n32.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,20 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -82,5 +66,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="fa">
Index: BOOK/cross-tools/mips64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/mips64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,20 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,12 +26,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -66,5 +58,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
@@ -116,12 +108,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/multilib/eglibc.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/multilib/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -29,12 +29,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -61,5 +53,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
Index: BOOK/cross-tools/ppc/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/ppc/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -34,12 +34,4 @@
     href="../../final-system/ppc/eglibc.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -103,12 +95,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -34,12 +34,4 @@
     href="../../final-system/ppc/eglibc.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -107,12 +99,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/ppc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/ppc64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -34,12 +34,4 @@
     href="../../final-system/ppc/eglibc.xml"
     xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/sparc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -91,12 +83,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
     <para os="do">The stubs.h header installed by eglibc looks for stubs-32.h
     and stubs-64.h. This configuration of eglibc only generates stubs-64.h. Fix
Index: BOOK/cross-tools/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -26,12 +26,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -103,12 +95,4 @@
     xpointer="xpointer(//*[@os='dn'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/sparc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/sparc64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -29,12 +29,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -61,5 +53,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -29,12 +29,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -62,5 +54,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
@@ -153,12 +145,4 @@
     xpointer="xpointer(//*[@os='do'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../../final-system/common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/cross-tools/x86_64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/cross-tools/x86_64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -29,12 +29,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='e'])"/>
 
@@ -62,5 +54,5 @@
     --disable-profile --with-tls --enable-kernel=2.6.32 --with-__thread \
     --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <variablelist os="dg">
Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/alpha/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -41,12 +41,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -118,12 +110,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/common/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -58,9 +58,4 @@
 unset LINKER</userinput></screen>
 
-    <para os="p3">The following patch fixes an issue that can cause
-      ALSA to crash:</para>
-      
-<screen os="p4"><userinput>patch -Np1 -i ../&eglibc-fixes-patch;</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
@@ -79,5 +74,6 @@
 
 <screen os="h"><userinput>../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc</userinput></screen>
+    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
@@ -152,10 +148,4 @@
 <screen os="t"><userinput>make install</userinput></screen>
 
-    <para os="ra">Install NIS and RPC related headers that are not installed by default.</para>
-
-<screen os="rb"><userinput>cp -v ../eglibc-&eglibc-version;/sunrpc/rpc/*.h /usr/include/rpc
-cp -v ../eglibc-&eglibc-version;/sunrpc/rpcsvc/*.h /usr/include/rpcsvc
-cp -v ../eglibc-&eglibc-version;/nis/rpcsvc/*.h /usr/include/rpcsvc</userinput></screen>
-
   </sect2>
 
@@ -249,4 +239,61 @@
 # End /etc/nsswitch.conf</literal>
 EOF</userinput></screen>
+
+    <para>Install timezone data:</para>
+<screen><userinput>tar -xf ../tzdata&tzdata-version;.tar.gz
+
+ZONEINFO=/usr/share/zoneinfo
+mkdir -pv $ZONEINFO/{posix,right}
+
+for tz in etcetera southamerica northamerica europe africa antarctica  \
+          asia australasia backward pacificnew solar87 solar88 solar89 \
+          systemv; do
+    zic -L /dev/null   -d $ZONEINFO       -y "sh yearistype.sh" ${tz}
+    zic -L /dev/null   -d $ZONEINFO/posix -y "sh yearistype.sh" ${tz}
+    zic -L leapseconds -d $ZONEINFO/right -y "sh yearistype.sh" ${tz}
+done
+
+cp -v zone.tab iso3166.tab $ZONEINFO
+zic -d $ZONEINFO -p America/New_York
+unset ZONEINFO</userinput></screen>
+
+    <variablelist>
+      <title>The meaning of the zic commands:</title>
+
+      <varlistentry>
+        <term><parameter>zic -L /dev/null ...</parameter></term>
+        <listitem>
+          <para>This creates posix timezones, without any leap seconds.  It is
+          conventional to put these in both
+          <filename class="directory">zoneinfo</filename> and
+          <filename class="directory">zoneinfo/posix</filename>. It is
+          necessary to put the POSIX timezones in
+          <filename class="directory">zoneinfo</filename>, otherwise various
+          test-suites will report errors. On an embedded system, where space is
+          tight and you do not intend to ever update the timezones, you could save
+          1.9MB by not using the <filename class="directory">posix</filename>
+          directory, but some applications or test-suites might give less good
+          results</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>zic -L leapseconds ...</parameter></term>
+        <listitem>
+          <para>This creates right timezones, including leap seconds. On an
+          embedded system, where space is tight and you do not intend to
+          ever update the timezones, or care about the correct time, you could
+          save 1.9MB by omitting the <filename class="directory">right</filename>
+          directory.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><parameter>zic ... -p ...</parameter></term>
+        <listitem>
+          <para>This creates the <filename>posixrules</filename> file. We use
+          New York because POSIX requires the daylight savings time rules
+          to be in accordance with US rules.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
 
     <para>To determine the local time zone, run the following script:</para>
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/mips/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -44,18 +44,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="g1">MIPS is not supported in the main EGLIBC tree, so
-    we need the eglibc-ports tarball. Unpack <filename>eglibc-ports-&eglibc-version;-r&eglibc-revision;</filename>:</para>
-
-<screen os="g2"><userinput>tar -xvf ../eglibc-ports-&eglibc-ports-version;-r&eglibc-revision;.tar.xz</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -123,12 +110,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -44,21 +44,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -148,12 +132,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -39,22 +39,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <para os="m3">The following will cause EGLIBC to use an absolute path to the
@@ -128,12 +112,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/mips64/eglibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-n32.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/mips64/eglibc-n32.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -40,22 +40,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -87,5 +71,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib32/eglibc --libdir=/usr/lib32</userinput></screen>
+    --libexecdir=/usr/lib32/eglibc --libdir=/usr/lib32 \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/mips64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -45,21 +45,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../mips/eglibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -40,12 +40,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
@@ -71,5 +63,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
+    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
@@ -122,12 +115,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
 
   </sect2>
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/multilib/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -45,12 +45,4 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
@@ -70,5 +62,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/ppc/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -41,12 +41,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="p5">The following patch fixes a mismatch of guards around qecvt and other functions. Required for yaboot.</para>
@@ -122,12 +114,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -38,12 +38,4 @@
     xpointer="xpointer(//*[@os='l4'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
      <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../ppc/eglibc.xml"
@@ -78,5 +70,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64</userinput></screen>
+    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
@@ -129,12 +122,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
 
   </sect2>
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -44,12 +44,4 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../../final-system/ppc/eglibc.xml"
     xpointer="xpointer(//*[@os='p5'])"/>
@@ -94,5 +86,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -41,12 +41,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -85,5 +77,5 @@
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -135,12 +127,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
     <para os="u">The stubs.h header installed by EGLIBC looks for stubs-32.h
     and stubs-64.h. This configuration of EGLIBC only generates stubs-64.h. Fix
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -37,12 +37,4 @@
     href="../multilib/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -79,5 +71,5 @@
     --disable-profile --enable-kernel=2.6.32 \
     --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
-    --cache-file=config.cache</userinput></screen>
+    --enable-obsolete-rpc --cache-file=config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -121,12 +113,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/x86/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -41,12 +41,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -68,5 +60,6 @@
 <screen os="h"><userinput>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) \
     -mtune=generic -g -O2" ../eglibc-&eglibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc</userinput></screen>
+    --disable-profile --enable-kernel=2.6.32 --libexecdir=/usr/lib/eglibc \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -138,12 +131,4 @@
     xpointer="xpointer(//*[@os='t'])"/>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -41,12 +41,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -74,5 +66,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib/eglibc --libdir=/usr/lib</userinput></screen>
+    --libexecdir=/usr/lib/eglibc --libdir=/usr/lib \
+    --enable-obsolete-rpc</userinput></screen>
 
     <variablelist os="i">
@@ -156,12 +149,4 @@
     <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
 
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
-
   </sect2>
 
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -37,12 +37,4 @@
     href="../multilib/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -74,5 +66,6 @@
     ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64</userinput></screen>
+    --libexecdir=/usr/lib64/eglibc --libdir=/usr/lib64 \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -115,12 +108,4 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='ra'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='rb'])"/>
 
   </sect2>
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision 5ae61b18d0e1c827e2f08040c6447c655f252d2c)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision 52ed4daa38c0057d8fe606d2b0d2e521a7e2312e)
@@ -42,12 +42,4 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
-    
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../common/eglibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -71,5 +63,6 @@
     -mtune=generic -g -O2" ../eglibc-&eglibc-version;/configure --prefix=/usr \
     --disable-profile --enable-kernel=2.6.32 \
-    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32}</userinput></screen>
+    --libexecdir=/usr/lib/eglibc --host=${CLFS_TARGET32} \
+    --enable-obsolete-rpc</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
