From f4affcfe20e3ec4e3a0dfd0eaac462a1221ef33b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 24 Aug 2026 19:26:27 +0800
Subject: [PATCH] non-x86-efi: Reapply "glibc: fix tanh crash on old
 processors"

This reverts commit 196ab73c44fe942e0a47cd93b0c624531bf388ba.

The patch slot is repurposed with parallel build fix (target
independent) so add it back before merging trunk.
---
 chapter03/patches.xml | 5 ++---
 chapter08/glibc.xml   | 9 ++++-----
 patches.ent           | 8 +++-----
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 01502231c..5abcffebc 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -77,15 +77,14 @@
     </varlistentry>
 -->
 
-<!--
     <varlistentry>
-      <term>Glibc Upstream Fixes Patch - <token>&glibc-upstream-patch-size;</token>:</term>
+      <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&glibc-upstream-patch;"/></para>
         <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index fe1a80157..12cc7a6e0 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -50,13 +50,12 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
 
-<!--
-    <para>Now add some fixes to address building and testing with Linux 7,
-    and fix 5 security vulnerabilities found after the glibc-2.43
-    release:</para>
+    <para>Now fix an issue causing the
+    <ulink role='man' url='&man;tanh.3'>tanh(3)</ulink> function to crash
+    on some old x86_64 processors.  Newer x86_64 processors and 32-bit x86
+    processors are not affected but the patch makes no harm either:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
--->
 
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
diff --git a/patches.ent b/patches.ent
index 3536c943a..b2c4fb36c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -27,11 +27,9 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
-<!--
-<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-patch-md5 "1f5074a1dce85a72d2ea465ca76e420b">
-<!ENTITY glibc-upstream-patch-size "49 KB">
--->
+<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fix-1.patch">
+<!ENTITY glibc-upstream-patch-md5 "1a9afeffc6bcf8dde6beb29aebb4a847">
+<!ENTITY glibc-upstream-patch-size "3.3 KB">
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">