Index: BOOK/cross-tools/64/eglibc.xml
===================================================================
--- BOOK/cross-tools/64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/alpha/eglibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc-headers.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/alpha/eglibc-headers.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -37,4 +37,12 @@
 <screen os="s2"><userinput>cp -v configure{,.orig}
 sed -e 's/3.4/3.[0-9]/g' configure.orig &gt; configure</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/alpha/eglibc.xml
===================================================================
--- BOOK/cross-tools/alpha/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/alpha/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/common/eglibc.xml
===================================================================
--- BOOK/cross-tools/common/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/common/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     the method suggested in this book puts the stability of the system at
     risk.</para>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/mips/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/mips64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -34,4 +34,12 @@
     href="../../final-system/mips64/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/mips64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -34,4 +34,12 @@
     href="../../final-system/mips64/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64/eglibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc-n32.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/mips64/eglibc-n32.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -34,4 +34,12 @@
     href="../../final-system/mips64/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/mips64/eglibc.xml
===================================================================
--- BOOK/cross-tools/mips64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/mips64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <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 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/multilib/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/multilib/eglibc.xml
===================================================================
--- BOOK/cross-tools/multilib/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/multilib/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/ppc/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/ppc64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/ppc64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/ppc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/ppc64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <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 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/sparc64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/sparc64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/sparc64/eglibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/sparc64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/x86/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/x86/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/x86_64-64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/x86_64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/cross-tools/x86_64/eglibc.xml
===================================================================
--- BOOK/cross-tools/x86_64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/cross-tools/x86_64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -26,4 +26,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../../final-system/common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/alpha/eglibc.xml
===================================================================
--- BOOK/final-system/alpha/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/alpha/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/common/eglibc.xml
===================================================================
--- BOOK/final-system/common/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/common/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -65,6 +65,9 @@
     of achieving a clean build.</para>
 
-    <para os="e">The EGLIBC documentation recommends building EGLIBC outside of the
-    source directory in a dedicated build directory:</para>
+    <para os="s1">Allow EGLIBC to detect Make-4.x:</para>
+
+<screen os="s2"><userinput>sed -r -i 's/(3..89..)/\1 | 4.*/' configure</userinput></screen>
+
+    <para os="e">The EGLIBC documentation recommends building EGLIBC outside of     the source directory in a dedicated build directory:</para>
 
 <screen os="f"><userinput>mkdir -v ../eglibc-build
Index: BOOK/final-system/mips/eglibc.xml
===================================================================
--- BOOK/final-system/mips/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/mips/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64-64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/mips64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -53,4 +53,12 @@
     href="../mips64/eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/mips64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -47,4 +47,12 @@
 <screen os="m4"><userinput>cp -v config.make.in{,.orig}
 sed '/ldd-rewrite-script/s:@:${objdir}/&amp;:' config.make.in.orig &gt; config.make.in</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/eglibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/eglibc-n32.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/mips64/eglibc-n32.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -50,4 +50,12 @@
     href="eglibc-64bit.xml"
     xpointer="xpointer(//*[@os='m4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/mips64/eglibc.xml
===================================================================
--- BOOK/final-system/mips64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/mips64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -46,4 +46,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <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 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/multilib/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -42,4 +42,12 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/multilib/eglibc.xml
===================================================================
--- BOOK/final-system/multilib/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/multilib/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -46,4 +46,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc/eglibc.xml
===================================================================
--- BOOK/final-system/ppc/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/ppc/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64-64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/ppc64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/ppc64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -41,4 +41,12 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/ppc64/eglibc.xml
===================================================================
--- BOOK/final-system/ppc64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/ppc64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -62,4 +62,12 @@
 
 <screen os="u4"><userinput>sed -i "s/\(^check-textrel-CFLAGS = \)/\1 ${BUILD32} /" elf/Makefile</userinput></screen>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <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 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/sparc64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/sparc64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/sparc64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -41,4 +41,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86/eglibc.xml
===================================================================
--- BOOK/final-system/x86/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/x86/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64-64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/x86_64-64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -45,4 +45,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64/eglibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/x86_64/eglibc-64bit.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -41,4 +41,12 @@
     href="eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
Index: BOOK/final-system/x86_64/eglibc.xml
===================================================================
--- BOOK/final-system/x86_64/eglibc.xml	(revision 8152b4a2d116f56f6b793ed6d92b518d171880a4)
+++ BOOK/final-system/x86_64/eglibc.xml	(revision 00a5864932eadd04fbcf13770b932750bd8cf948)
@@ -46,4 +46,12 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
