Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ chapter01/changelog.xml	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -40,4 +40,11 @@
       <para>2007-08-07</para>
       <itemizedlist>
+        <listitem>
+          <para>[jhuntwork] - Since we're using HJL Binutils, add m4, bison and flex
+	  back to chatper 5.</para>
+        </listitem>
+	<listitem>
+	  <para>[jhuntwork] - Upgraded to GCC 4.2.1</para>
+	</listitem>
 	<listitem>
 	  <para>[jhuntwork] - Upgraded to HJL Binutils-2.17.50.0.18</para>
Index: chapter01/whatsnew.xml
===================================================================
--- chapter01/whatsnew.xml	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ chapter01/whatsnew.xml	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -77,8 +77,8 @@
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GCC &gcc-version;</para>
     </listitem>
-    <listitem>
+    <!-- <listitem>
       <para>Gettext &gettext-version;</para>
     </listitem>-->
Index: chapter05/chapter05.xml
===================================================================
--- chapter05/chapter05.xml	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ chapter05/chapter05.xml	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -34,5 +34,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gzip.xml"/>
-  <!--<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>-->
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="flex.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="make.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="patch.xml"/>
Index: chapter05/flex.xml
===================================================================
--- chapter05/flex.xml	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ chapter05/flex.xml	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -38,17 +38,5 @@
     <title>Installation of Flex</title>
 
-    <para>Flex contains several known bugs. These can be fixed with the
-    following patch:</para>
-
-<screen><userinput>patch -Np1 -i ../&flex-fixes-patch;</userinput></screen>
-
-    <para>The GNU autotools will detect that the Flex source code has been
-    modified by the previous patch and tries to update the man page
-    accordingly.  This does not work on many systems, and the default page is
-    fine, so make sure it does not get regenerated:</para>
-
-<screen><userinput>touch doc/flex.1</userinput></screen>
-
-    <para>Now prepare Flex for compilation:</para>
+    <para>Prepare Flex for compilation:</para>
 
 <screen><userinput>./configure --prefix=/tools</userinput></screen>
Index: chapter05/gcc-pass1.xml
===================================================================
--- chapter05/gcc-pass1.xml	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ chapter05/gcc-pass1.xml	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -47,5 +47,5 @@
 
 <screen><userinput>CC="gcc -B/usr/bin/" ../gcc-&gcc-version;/configure --prefix=/tools \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
+    --with-local-prefix=/tools --disable-nls --disable-shared \
     --enable-languages=c --disable-multilib</userinput></screen>
 
@@ -76,12 +76,8 @@
 
       <varlistentry>
-        <term><parameter>--enable-shared</parameter></term>
+        <term><parameter>--disable-shared</parameter></term>
         <listitem>
-          <para>This switch allows the building of <filename
-          class="libraryfile">libgcc_s.so.1</filename> and
-          <filename class="libraryfile">libgcc_eh.a</filename>.
-          Having <filename class="libraryfile">libgcc_eh.a</filename>
-          available ensures that the configure script for Glibc (the
-          next package we compile) produces the proper results.</para>
+          <para>This forces gcc to link its internal libraries statically. We do this
+	  to avoid possible issues with the host system.</para>
         </listitem>
       </varlistentry>
Index: packages.ent
===================================================================
--- packages.ent	(revision 71f6077e8ce454a7843d344ec2bac721aaed2983)
+++ packages.ent	(revision 54ce9a9e7ba53734593564d6141de1d488e0e09e)
@@ -56,8 +56,6 @@
 <!ENTITY bison-md5 "c18640c6ec31a169d351e3117ecce3ec">
 <!ENTITY bison-home "&gnu-software;bison/">
-<!--
-<!ENTITY bison-ch5-du "">
-<!ENTITY bison-ch5-sbu "">
--->
+<!ENTITY bison-ch5-du "12.3 MB">
+<!ENTITY bison-ch5-sbu "0.2 SBU">
 <!ENTITY bison-ch6-du "12.3 MB">
 <!ENTITY bison-ch6-sbu "0.2 SBU">
@@ -152,8 +150,6 @@
 <!ENTITY flex-md5 "343374a00b38d9e39d1158b71af37150">
 <!ENTITY flex-home "http://flex.sourceforge.net">
-<!--
-<!ENTITY flex-ch5-du "">
-<!ENTITY flex-ch5-sbu "">
--->
+<!ENTITY flex-ch5-du "8.4 MB">
+<!ENTITY flex-ch5-sbu "0.1 SBU">
 <!ENTITY flex-ch6-du "8.4 MB">
 <!ENTITY flex-ch6-sbu "0.1 SBU">
@@ -169,8 +165,8 @@
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.1.2">
-<!ENTITY gcc-size "38,777 KB">
+<!ENTITY gcc-version "4.2.1">
+<!ENTITY gcc-size "43,029 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "a4a3eb15c96030906d8494959eeda23c">
+<!ENTITY gcc-md5 "cba410e6ff70f7d7f4be7a0267707fd0">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "655 MB">
