From 04ab6d0f556ed4d2a8ccb5707c3b1ded32354b38 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 20 Jun 2023 17:55:11 +0800
Subject: [PATCH] loongarch: Patch libelf for LoongArch support

---
 chapter01/changelog.xml | 9 +++++++++
 chapter01/whatsnew.xml  | 4 ++++
 chapter03/patches.xml   | 8 ++++++++
 chapter08/libelf.xml    | 8 +++++---
 patches.ent             | 3 +++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9a0064f9a..1b7c21398 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,15 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-06-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Patch libelf for LoongArch support.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-06-17</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 900d310f7..332e3a8e3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -308,6 +308,10 @@
       <para>Pkgconf-&flit-core-version;</para>
     </listitem>
 
+    <listitem>
+      <para>&elfutils-loongarch-patch;</para>
+    </listitem>
+
     <listitem>
       <para>Flit-core-&flit-core-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index b98484149..dd280e4f6 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -77,6 +77,14 @@
       </listitem>
     </varlistentry>
 -->
+    <varlistentry>
+      <term>Elfutils LoongArch Support Patch - <token>&elfutils-loongarch-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="https://www.linuxfromscratch.org/~xry111/lfs/patches/&elfutils-loongarch-patch;"/></para>
+        <para>MD5 sum: <literal>&elfutils-loongarch-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/libelf.xml b/chapter08/libelf.xml
index ddc786539..dd3642857 100644
--- a/chapter08/libelf.xml
+++ b/chapter08/libelf.xml
@@ -44,6 +44,11 @@
       <para>Libelf is part of the elfutils-&elfutils-version; package. Use
       the elfutils-&elfutils-version;.tar.bz2 file as the source tarball.</para>
 
+    <para>Add LoongArch support for this package:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&elfutils-loongarch-patch;
+autoreconf -fi</userinput></screen>
+
     <para>Prepare Libelf for compilation:</para>
 
     <screen><userinput remap="configure">./configure --prefix=/usr                \
@@ -58,9 +63,6 @@
 
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>7 tests are known to fail because the support for LoongArch is
-    not complete in this Libelf release.</para>
-
     <para>Install only Libelf:</para>
 
 <screen><userinput remap="install">make -C libelf install
diff --git a/patches.ent b/patches.ent
index c9d483de5..ba8e783ba 100644
--- a/patches.ent
+++ b/patches.ent
@@ -30,6 +30,9 @@
 <!ENTITY coreutils-chmod-patch-md5 "4709df88e68279e6ef357aa819ba5b1a">
 <!ENTITY coreutils-chmod-patch-size "3.8 KB">
 -->
+<!ENTITY elfutils-loongarch-patch "elfutils-&elfutils-version;-loongarch-1.patch">
+<!ENTITY elfutils-loongarch-patch-md5 "d40bdbc21abd4bd3c51a7c6729ed3a85">
+<!ENTITY elfutils-loongarch-patch-size "44 KB">
 <!--
 <!ENTITY flex-fixes-patch "flex-&flex-version;-upstream_fixes-3.patch">
 <!ENTITY flex-fixes-patch-md5 "b46f6b0380e502a3dfb8b503227cd680">