6 files changed, 5 insertions, 83 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d28f05c4d..24c22500a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -91,12 +91,6 @@ First a summary, then a detailed log.</para>
 <listitem><para>&bzip2-docs-patch;</para></listitem>
 <listitem><para>&gawk-segfault-patch;</para></listitem>
 <listitem><para>&gcc-specs-patch;</para></listitem>
-<listitem><para>&glibc-gcc4_elf-patch;</para></listitem>
-<listitem><para>&glibc-gcc4_iconvdata-patch;</para></listitem>
-<listitem><para>&glibc-gcc4_mathtest-patch;</para></listitem>
-<listitem><para>&glibc-gcc4_string-patch;</para></listitem>
-<listitem><para>&glibc-gcc4_symbols-patch;</para></listitem>
-<listitem><para>&glibc-testfix-patch;</para></listitem>
 <listitem><para>&inetutils-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&kbd-gcc4_fixes-patch;</para></listitem>
 <listitem><para>&mktemp-tempfile-patch;</para></listitem>
@@ -122,6 +116,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>November 6, 2005 [matt]: Upgrade to Glibc 2.3.6.</para>
+</listitem>
+
 <listitem><para>November 5, 2005 [matt]: Add a note to the toolchain sanity
 check in chapter 5 to explain that if TCL fails to build, it's an indication of
 a broken toolchain (bug 1581).</para></listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 109903a68..31de8d43d 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -144,7 +144,7 @@ url="http://www.linuxfromscratch.org/lfs/download.html#ftp"/>.</para></note>
 </varlistentry>
 
 <varlistentry>
-<term>Glibc (&glibc-version;) - 13,288 KB:</term>
+<term>Glibc (&glibc-version;) - 13,687 KB:</term>
 <listitem>
 <para><ulink url="&gnu;glibc/"/></para>
 </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 108bb3769..fef98115d 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -88,48 +88,6 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
-<term>Glibc Fix Testsuite Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-testfix-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Glibc GCC-4.x ELF Patch - 15KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-gcc4_elf-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Glibc GCC-4.x Iconvdata Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-gcc4_iconvdata-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Glibc GCC-4.x Mathtest Patch - 9 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-gcc4_mathtest-patch;"/></para>
-</listitem>
-</varlistentry> 
-
-<varlistentry>
-<term>Glibc GCC-4.x String Patch - 2 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-gcc4_string-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>Glibc GCC-4.x Symbols Patch - 5 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;&glibc-gcc4_symbols-patch;"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Gzip Security Patch - 2 KB:</term><listitem>
 <para><ulink url="&patches-root;&gzip-security_fix-patch;"/></para>
 </listitem>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 0b022a19b..7c99a9b1a 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -40,20 +40,6 @@ unset them when building Glibc.</para>
 the method suggested in this book puts the stability of the system at
 risk.</para>
 
-<para>Glibc has two tests which fail when the running kernel is 2.6.11 or later.
-The problem has been determined to be with the tests themselves, not with the C library or the kernel.  If you plan to run the testsuite apply this patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
-
-<para>Apply the following patches to enable Glibc to compile with
-GCC-&gcc-version;:</para>
-
-
-<screen><userinput>patch -Np1 -i ../&glibc-gcc4_symbols-patch;
-patch -Np1 -i ../&glibc-gcc4_string-patch;
-patch -Np1 -i ../&glibc-gcc4_elf-patch;
-patch -Np1 -i ../&glibc-gcc4_iconvdata-patch;</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 047f35215..8e5abee70 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -62,25 +62,6 @@ within the Glibc source directory:</para>
 
 <screen><userinput>tar -xvf ../glibc-linuxthreads-&glibc-version;.tar.bz2</userinput></screen>
 
-<para>Glibc has two tests which fail when the running kernel is 2.6.11 or later.
-The problem has been determined to be with the tests themselves, not with the
-C library or the kernel. This patch fixes the problem:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-testfix-patch;</userinput></screen>
-
-<para>Apply the following patches to enable Glibc to compile with
-GCC-&gcc-version;:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-gcc4_symbols-patch;
-patch -Np1 -i ../&glibc-gcc4_string-patch;
-patch -Np1 -i ../&glibc-gcc4_elf-patch;
-patch -Np1 -i ../&glibc-gcc4_iconvdata-patch;</userinput></screen>
-
-<para>The following patch corrects the expected results for some of the math
-tests on x86 processors when compiled with GCC-&gcc-version;:</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-gcc4_mathtest-patch;</userinput></screen>
-
 <para>The Glibc documentation recommends building Glibc outside of the source
 directory in a dedicated build directory:</para>
 
diff --git a/general.ent b/general.ent
index 0610a6098..331ef66eb 100644
--- a/general.ent
+++ b/general.ent
@@ -42,7 +42,7 @@
 <!ENTITY gawk-version "3.1.5">
 <!ENTITY gcc-version "4.0.2">
 <!ENTITY gettext-version "0.14.5">
-<!ENTITY glibc-version "2.3.5">
+<!ENTITY glibc-version "2.3.6">
 <!ENTITY grep-version "2.5.1a">
 <!ENTITY groff-version "1.19.2">
 <!ENTITY grub-version "0.97">