From 97719418c112b0322a9c671a5ecedeab7de8cc1c Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 29 Oct 2011 20:09:32 +0000
Subject: [PATCH] Upgrade to GCC-4.6.2. Fixes #2951.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9657 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  4 ++++
 chapter01/whatsnew.xml  | 10 +++++-----
 chapter03/patches.xml   |  8 --------
 chapter06/gcc.xml       |  5 -----
 packages.ent            |  6 +++---
 patches.ent             |  4 ----
 6 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index fb025167d..4626a745c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-10-29</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to GCC-4.6.2. Fixes
+          <ulink url="&lfs-ticket-root;2951">#2951</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Util-Linux-2.20.1. Fixes
           <ulink url="&lfs-ticket-root;2947">#2947</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 637c80267..248aa88bc 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -79,9 +79,9 @@
     <!--<listitem>
       <para>Gawk &gawk-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>GCC &gcc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GDBM &gdbm-version;</para>
     </listitem>-->
@@ -234,13 +234,13 @@
 
   </itemizedlist>-->
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Removed:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>gcc-4.6.1-locale-1.patch</para>
     </listitem>
 
-  </itemizedlist>-->
+  </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 234c75739..15f2bf171 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -98,14 +98,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>GCC Locale Patch - <token>&gcc-locale-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gcc-locale-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-locale-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
 <!--
     <varlistentry>
       <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index 74665889a..b2b0cd6b2 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -66,11 +66,6 @@ esac</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in</userinput></screen>
 
-    <para>Finally, apply a patch that corrects the test code for locale changes
-    that were made in glibc-2.14 and later.</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../gcc-4.6.1-locale-1.patch</userinput></screen>
-
     <para>The GCC documentation recommends building GCC outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/packages.ent b/packages.ent
index fe556b199..0c767374d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -170,10 +170,10 @@
 <!ENTITY gawk-ch6-du "28 MB">
 <!ENTITY gawk-ch6-sbu "0.2 SBU">
 
-<!ENTITY gcc-version "4.6.1">
-<!ENTITY gcc-size "70,009 KB">
+<!ENTITY gcc-version "4.6.2">
+<!ENTITY gcc-size "70,308 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "c57a9170c677bf795bdc04ed796ca491">
+<!ENTITY gcc-md5 "028115c4fbfb6cfd75d6369f4a90d87e">
 <!ENTITY gcc-home "http://gcc.gnu.org/">
 <!ENTITY gcc-ch5p1-du "1.2 GB">
 <!ENTITY gcc-ch5p1-sbu "5.0 SBU">
diff --git a/patches.ent b/patches.ent
index c60fea631..a16fcd0cd 100644
--- a/patches.ent
+++ b/patches.ent
@@ -39,10 +39,6 @@
 <!ENTITY gcc-startfiles-patch-md5 "799ef1971350d2e3c794f2123f247cc6">
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 
-<!ENTITY gcc-locale-patch "gcc-&gcc-version;-locale-1.patch">
-<!ENTITY gcc-locale-patch-md5 "406572f979f480be1450eb88eea08caa">
-<!ENTITY gcc-locale-patch-size "4 KB">
-
 <!ENTITY glibc-fixes-patch "glibc-&glibc-version;-fixes-1.patch">
 <!ENTITY glibc-fixes-patch-md5 "13bdfb7db1654d9c3d7934d24479a6c4">
 <!ENTITY glibc-fixes-patch-size "5.5 KB">