[Clfs-commits] commit: r4041 - in /trunk/BOOK: ./ cross-tools/64/ cross-tools/alpha/ cross-tools/common/ cross-tools/mips/ cross-tools/mips64-64/ cross-tools/mips64/ cross-tools/multilib/ cross-tools/ppc/ cross-tools/ppc64/ cross-tools/sparc/ cross-tools/sparc64-64/ cross-tools/sparc64/ cross-tools/x86/ cross-tools/x86_64/ final-system/alpha/ final-system/common/ final-system/mips/ final-system/mips64-64/ final-system/mips64/ final-system/multilib/ final-system/ppc/ final-system/ppc64/ final-system/sparc/ final-system/sparc64-64/ final-system/sparc64/ final-system/x86/ final-system/x86_64-64/ final-system/x86_64/ introduction/common/ materials/common/ materials/x86/

svn at cross-lfs.org svn at cross-lfs.org
Sat Sep 20 09:32:44 PDT 2008


Author: jciccone
Date: Sat Sep 20 16:32:44 2008
New Revision: 4041

Log:
Updated Glibc to 2.8.

Modified:
    trunk/BOOK/cross-tools/64/glibc.xml
    trunk/BOOK/cross-tools/alpha/glibc-headers.xml
    trunk/BOOK/cross-tools/alpha/glibc.xml
    trunk/BOOK/cross-tools/common/glibc.xml
    trunk/BOOK/cross-tools/mips/glibc.xml
    trunk/BOOK/cross-tools/mips64-64/glibc.xml
    trunk/BOOK/cross-tools/mips64/glibc-64bit.xml
    trunk/BOOK/cross-tools/mips64/glibc-n32.xml
    trunk/BOOK/cross-tools/mips64/glibc.xml
    trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
    trunk/BOOK/cross-tools/multilib/glibc.xml
    trunk/BOOK/cross-tools/ppc/glibc.xml
    trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml
    trunk/BOOK/cross-tools/ppc64/glibc.xml
    trunk/BOOK/cross-tools/sparc/glibc.xml
    trunk/BOOK/cross-tools/sparc64-64/glibc.xml
    trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
    trunk/BOOK/cross-tools/sparc64/glibc.xml
    trunk/BOOK/cross-tools/x86/glibc.xml
    trunk/BOOK/cross-tools/x86_64/glibc.xml
    trunk/BOOK/final-system/alpha/glibc.xml
    trunk/BOOK/final-system/common/glibc.xml
    trunk/BOOK/final-system/mips/glibc.xml
    trunk/BOOK/final-system/mips64-64/glibc.xml
    trunk/BOOK/final-system/mips64/glibc-64bit.xml
    trunk/BOOK/final-system/mips64/glibc-n32.xml
    trunk/BOOK/final-system/mips64/glibc.xml
    trunk/BOOK/final-system/multilib/glibc-64bit.xml
    trunk/BOOK/final-system/multilib/glibc.xml
    trunk/BOOK/final-system/ppc/glibc.xml
    trunk/BOOK/final-system/ppc64/glibc-64bit.xml
    trunk/BOOK/final-system/ppc64/glibc.xml
    trunk/BOOK/final-system/sparc/glibc.xml
    trunk/BOOK/final-system/sparc64-64/glibc.xml
    trunk/BOOK/final-system/sparc64/glibc-64bit.xml
    trunk/BOOK/final-system/sparc64/glibc.xml
    trunk/BOOK/final-system/x86/glibc.xml
    trunk/BOOK/final-system/x86_64-64/glibc.xml
    trunk/BOOK/final-system/x86_64/glibc-64bit.xml
    trunk/BOOK/final-system/x86_64/glibc.xml
    trunk/BOOK/introduction/common/changelog.xml
    trunk/BOOK/materials/common/patches.xml
    trunk/BOOK/materials/x86/patches.xml
    trunk/BOOK/packages.ent
    trunk/BOOK/patches.ent

Modified: trunk/BOOK/cross-tools/64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/alpha/glibc-headers.xml
==============================================================================
--- trunk/BOOK/cross-tools/alpha/glibc-headers.xml (original)
+++ trunk/BOOK/cross-tools/alpha/glibc-headers.xml Sat Sep 20 16:32:44 2008
@@ -45,7 +45,8 @@
 <screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
 echo "libc_cv_c_cleanup=yes" >> config.cache
 echo "libc_cv_mlong_double_128=yes" >> config.cache
-echo "libc_cv_alpha_tls=yes" >> config.cache</userinput></screen>
+echo "libc_cv_alpha_tls=yes" >> config.cache
+echo "libc_cv_gnu89_inline=yes" >> config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"

Modified: trunk/BOOK/cross-tools/alpha/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/alpha/glibc.xml (original)
+++ trunk/BOOK/cross-tools/alpha/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/alpha/glibc.xml"

Modified: trunk/BOOK/cross-tools/common/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/common/glibc.xml (original)
+++ trunk/BOOK/cross-tools/common/glibc.xml Sat Sep 20 16:32:44 2008
@@ -26,14 +26,6 @@
     the method suggested in this book puts the stability of the system at
     risk.</para>
 
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
     <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
 
 <screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
@@ -58,7 +50,8 @@
     <filename>config.cache</filename> for Glibc to support NPTL:</para>
 
 <screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
-echo "libc_cv_c_cleanup=yes" >> config.cache</userinput></screen>
+echo "libc_cv_c_cleanup=yes" >> config.cache
+echo "libc_cv_gnu89_inline=yes" >> config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"

Modified: trunk/BOOK/cross-tools/mips/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips/glibc.xml (original)
+++ trunk/BOOK/cross-tools/mips/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64-64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64-64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/mips64-64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-64bit.xml (original)
+++ trunk/BOOK/cross-tools/mips64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64/glibc-n32.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64/glibc-n32.xml (original)
+++ trunk/BOOK/cross-tools/mips64/glibc-n32.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/cross-tools/mips64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/mips64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/mips64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"

Modified: trunk/BOOK/cross-tools/multilib/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/cross-tools/multilib/glibc-64bit.xml (original)
+++ trunk/BOOK/cross-tools/multilib/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/cross-tools/multilib/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/multilib/glibc.xml (original)
+++ trunk/BOOK/cross-tools/multilib/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/ppc/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/ppc/glibc.xml (original)
+++ trunk/BOOK/cross-tools/ppc/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,22 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
@@ -72,7 +56,8 @@
 
 <screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
 echo "libc_cv_c_cleanup=yes" >> config.cache
-echo "libc_cv_ppc_machine=yes" >> config.cache</userinput></screen>
+echo "libc_cv_ppc_machine=yes" >> config.cache
+echo "libc_cv_gnu89_inline=yes" >> config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/glibc.xml"

Modified: trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml (original)
+++ trunk/BOOK/cross-tools/ppc64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -25,22 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/ppc64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/ppc64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/ppc64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,22 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/sparc/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc/glibc.xml (original)
+++ trunk/BOOK/cross-tools/sparc/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/sparc64-64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64-64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/sparc64-64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml (original)
+++ trunk/BOOK/cross-tools/sparc64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
@@ -64,7 +56,8 @@
 
 <screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" > config.cache
 echo "libc_cv_c_cleanup=yes" >> config.cache
-echo "libc_cv_sparc64_tls=yes" >> config.cache</userinput></screen>
+echo "libc_cv_sparc64_tls=yes" >> config.cache
+echo "libc_cv_gnu89_inline=yes" >> config.cache</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../multilib/glibc-64bit.xml"

Modified: trunk/BOOK/cross-tools/sparc64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/sparc64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/sparc64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/x86/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/x86/glibc.xml (original)
+++ trunk/BOOK/cross-tools/x86/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,14 +28,6 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='db'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -49,14 +41,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(//*[@os='ap1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(//*[@os='ap2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/cross-tools/x86_64/glibc.xml
==============================================================================
--- trunk/BOOK/cross-tools/x86_64/glibc.xml (original)
+++ trunk/BOOK/cross-tools/x86_64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -25,14 +25,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/alpha/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/alpha/glibc.xml (original)
+++ trunk/BOOK/final-system/alpha/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="a1">The following patch moves PTR_MANGLE and ensures that
     PTR_MANGLE is defined in all cases:</para>

Modified: trunk/BOOK/final-system/common/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/common/glibc.xml (original)
+++ trunk/BOOK/final-system/common/glibc.xml Sat Sep 20 16:32:44 2008
@@ -44,17 +44,6 @@
     and linker cannot be adjusted before the Glibc install because the
     Glibc Autoconf tests would give false results and defeat the goal
     of achieving a clean build.</para>
-
-    <para os="p1">The following patch merges all updates from the &glibc-version; Branch
-    from the Glibc developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
-
-    <para os="p3">The following patch causes the Glibc build system to include
-    headers from GCC's <filename class="directory">include-fixed</filename>
-    directory:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&glibc-include_fixed-patch;</userinput></screen>
 
     <para os="c">The following patch fixes an issue that can
     cause <command>localdef</command> to segfault:</para>

Modified: trunk/BOOK/final-system/mips/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/mips/glibc.xml (original)
+++ trunk/BOOK/final-system/mips/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="g1">MIPS is no longer supported in the main Glibc tree, so we have to
     extract the glibc-ports-&glibc-version; package into our

Modified: trunk/BOOK/final-system/mips64-64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/mips64-64/glibc.xml (original)
+++ trunk/BOOK/final-system/mips64-64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"

Modified: trunk/BOOK/final-system/mips64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/mips64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/mips64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/final-system/mips64/glibc-n32.xml
==============================================================================
--- trunk/BOOK/final-system/mips64/glibc-n32.xml (original)
+++ trunk/BOOK/final-system/mips64/glibc-n32.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"

Modified: trunk/BOOK/final-system/mips64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/mips64/glibc.xml (original)
+++ trunk/BOOK/final-system/mips64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -29,22 +29,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/glibc.xml"

Modified: trunk/BOOK/final-system/multilib/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/multilib/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/multilib/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/glibc.xml (original)
+++ trunk/BOOK/final-system/multilib/glibc.xml Sat Sep 20 16:32:44 2008
@@ -29,22 +29,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/ppc/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/ppc/glibc.xml (original)
+++ trunk/BOOK/final-system/ppc/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/ppc64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/ppc64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/ppc64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/ppc64/glibc.xml (original)
+++ trunk/BOOK/final-system/ppc64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -29,22 +29,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/sparc/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/sparc/glibc.xml (original)
+++ trunk/BOOK/final-system/sparc/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/sparc64-64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64-64/glibc.xml (original)
+++ trunk/BOOK/final-system/sparc64-64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/sparc64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/sparc64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/sparc64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/sparc64/glibc.xml (original)
+++ trunk/BOOK/final-system/sparc64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -29,22 +29,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/x86/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/x86/glibc.xml (original)
+++ trunk/BOOK/final-system/x86/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,27 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="ap1">The following patch ensures that memcpy_chk, mempcpy_chk,
-    and memset_chk are defined for i586.</para>
-
-    <screen os="ap2"><userinput>patch -Np1 -i ../&glibc-i586_chk-patch;</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/x86_64-64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64-64/glibc.xml (original)
+++ trunk/BOOK/final-system/x86_64-64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -28,22 +28,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/x86_64/glibc-64bit.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/glibc-64bit.xml (original)
+++ trunk/BOOK/final-system/x86_64/glibc-64bit.xml Sat Sep 20 16:32:44 2008
@@ -24,22 +24,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/final-system/x86_64/glibc.xml
==============================================================================
--- trunk/BOOK/final-system/x86_64/glibc.xml (original)
+++ trunk/BOOK/final-system/x86_64/glibc.xml Sat Sep 20 16:32:44 2008
@@ -29,22 +29,6 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"
     xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/glibc.xml"

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Sat Sep 20 16:32:44 2008
@@ -35,6 +35,15 @@
       </itemizedlist>
     </listitem>
 -->
+
+    <listitem>
+      <para>September 20, 2008</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Glibc to 2.8.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>September 14, 2008</para>

Modified: trunk/BOOK/materials/common/patches.xml
==============================================================================
--- trunk/BOOK/materials/common/patches.xml (original)
+++ trunk/BOOK/materials/common/patches.xml Sat Sep 20 16:32:44 2008
@@ -78,24 +78,6 @@
         <para>Download: <ulink
         url="&patches-root;&gcc-posix-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Branch Update Patch - <token>&glibc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Include Fixed Headers Patch - <token>&glibc-include_fixed-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-include_fixed-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-include_fixed-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/BOOK/materials/x86/patches.xml
==============================================================================
--- trunk/BOOK/materials/x86/patches.xml (original)
+++ trunk/BOOK/materials/x86/patches.xml Sat Sep 20 16:32:44 2008
@@ -18,15 +18,6 @@
         <para>Download: <ulink
         url="&patches-root;&gcc-specs-patch;"/></para>
         <para>MD5 sum: <literal>&gcc-specs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibc-i586_chk-patch">
-      <term>Glibc i586 memcpy, mempcpy, memset Patch - <token>&glibc-i586_chk-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-i586_chk-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-i586_chk-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent (original)
+++ trunk/BOOK/packages.ent Sat Sep 20 16:32:44 2008
@@ -123,9 +123,7 @@
 
 <!ENTITY file-version "4.26">
 <!ENTITY file-size "571 KB">
-<!--
-<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
--->
+<!-- <!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz"> -->
 <!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">
 <!ENTITY file-md5 "74cd5466416136da30a4e69f74dbc7a0">
 <!ENTITY file-home "http://www.darwinsys.com/file">
@@ -160,17 +158,19 @@
 <!ENTITY gettext-md5 "58a2bc6d39c0ba57823034d55d65d606">
 <!ENTITY gettext-home "&gnu-software;gettext">
 
-<!ENTITY glibc-version "2.7">
-<!ENTITY glibc-size "15624 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "065c5952b439deba40083ccd67bcc8f7">
+<!ENTITY glibc-version "2.8">
+<!ENTITY glibc-size "15,156 KB">
+<!-- <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2"> -->
+<!ENTITY glibc-url "&packages-root;glibc-&glibc-version;.tar.bz2">
+<!ENTITY glibc-md5 "1dd3f75c120f316339bede17edd08668">
 <!ENTITY glibc-home "&gnu-software;libc">
 <!ENTITY glibc-ld-name "ld-&glibc-version;.so">
 
 <!ENTITY glibc-ports-version "&glibc-version;">
 <!ENTITY glibc-ports-size "432 KB">
-<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2">
-<!ENTITY glibc-ports-md5 "eaeb8527b8fa286c2d887157214f9998">
+<!--<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2"> -->
+<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-version;.tar.bz2">
+<!ENTITY glibc-ports-md5 "1ba63c16e405a1b4de3dc23f2f93ec49">
 <!ENTITY glibc-ports-home " ">
 
 <!ENTITY gmp-version "4.2.3">

Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Sat Sep 20 16:32:44 2008
@@ -36,20 +36,12 @@
 <!ENTITY gcc-specs-patch-md5 "8b216c7c3d66af2c1bce9221d65997a7">
 <!ENTITY gcc-specs-patch-size "20 KB">
 
-<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-1A.patch">
-<!ENTITY glibc-branch_update-patch-md5 "dd1119b68f26308446d33ccde05732b4">
-<!ENTITY glibc-branch_update-patch-size "64 KB">
-
-<!ENTITY glibc-include_fixed-patch "glibc-&glibc-version;-include_fixed-1.patch">
-<!ENTITY glibc-include_fixed-patch-md5 "02bc55d1f685805ef165343619515617">
-<!ENTITY glibc-include_fixed-patch-size "4 KB">
-
 <!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-libgcc_eh-patch-md5 "f868605171066a0d8f572314feea415c">
+<!ENTITY glibc-libgcc_eh-patch-md5 "02bbf6bc29e34c4fc92fb478fddd43dd">
 <!ENTITY glibc-libgcc_eh-patch-size "8 KB">
 
 <!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
-<!ENTITY glibc-localedef_segfault-patch-md5 "3ce6946b16e90a73d90ac701a5940709">
+<!ENTITY glibc-localedef_segfault-patch-md5 "7f8d1687d78f18cc46db1531fb17f7fe">
 <!ENTITY glibc-localedef_segfault-patch-size "4 KB">
 
 <!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-2.patch">
@@ -178,12 +170,6 @@
 <!ENTITY silo-fixes-patch-md5 "c65334fd6b3b99d824c458d0a3eac9b1">
 <!ENTITY silo-fixes-patch-size "668 KB">
 
-<!-- Start of x86 patches -->
-
-<!ENTITY glibc-i586_chk-patch "glibc-&glibc-version;-i586_chk-2.patch">
-<!ENTITY glibc-i586_chk-patch-md5 "bb6e8f1936d357ec50e479d4977b9f98">
-<!ENTITY glibc-i586_chk-patch-size "4 KB">
-
 <!-- Start of x86/x86_64 patches -->
 
 <!ENTITY bin86-x86_64-patch "bin86-&bin86-version;-x86_64-1.patch">




More information about the Clfs-commits mailing list