From 33505d67f82f675d2ad01cc41105d39cbeee2287 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Thu, 1 Jul 2021 19:34:12 +0100
Subject: [PATCH] Patch gcc :

Fix some regressions, and cope with removal of a kernel header in
linux-5.13 which broke the build in chapter 8's bootstrap.
---
 chapter01/changelog.xml | 12 ++++++++++++
 chapter01/whatsnew.xml  |  3 +++
 chapter03/patches.xml   | 10 +++++-----
 chapter08/gcc.xml       |  5 +++++
 patches.ent             | 10 +++++-----
 5 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index eaa4add22..508b5fd88 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,18 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-07-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch gcc to fix some regressions (will be
+          needed to build firefox-91ESR in BLFS) and to allow it to
+          build against linux-5.13.0 kernel headers. Fixes
+          <ulink url="&lfs-ticket-root;4875">#4875</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2021-06-28</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index d77cb7e41..41d3879a8 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -281,6 +281,9 @@
     <!--<listitem>
       <para>meson-0.56.0-upstream_fix-1.patch</para>
     </listitem>-->
+    <listitem>
+      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
+    </listitem>
     <listitem>
       <para>systemd-247-upstream_fixes-2.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 29e6cb127..3dd115094 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -67,15 +67,15 @@
         <para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-<!--
+
     <varlistentry>
-      <term>GCC Cross Build Fix Patch - <token>&gcc-cross-patch-size;</token>:</term>
+      <term>GCC Upstream Fixes Patch - <token>&gcc-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&gcc-cross-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-cross-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&gcc-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index f7facefdd..819396e26 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -41,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
+    <para>First, apply a patch to fix some regressions and to cope
+    with the removal of an obsolete kernel header in linux-5.13:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../glibc-&glibc-version;-upstream_fixes-1.patch</userinput></screen>
+
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
diff --git a/patches.ent b/patches.ent
index 48c6184eb..bf849b05e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -29,11 +29,11 @@
 <!ENTITY flex-fixes-patch-md5 "b46f6b0380e502a3dfb8b503227cd680">
 <!ENTITY flex-fixes-patch-size "3.4 KB">
 -->
-<!--
-<!ENTITY gcc-cross-patch "gcc-&gcc-version;-cet_fix-1.patch">
-<!ENTITY gcc-cross-patch-md5 "f37d8a6b4c943a6f8eaf541923fed838">
-<!ENTITY gcc-cross-patch-size "4.3 KB">
--->
+
+<!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4">
+<!ENTITY gcc-upstream-fixes-patch-size "18.0 KB">
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">