From 12632200df1548b1ed0b69d7ed096473add9b4f7 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Tue, 14 May 2024 12:19:24 +0800
Subject: [PATCH] loongarch: Revert "loongarch: gcc: Apply an upstream change
 to prevent the linker from generating illegal instructions"

This reverts commit 4ac095c78bc643e43e63822ac5162dbd99134791.

The change is included in GCC >= 14.1.
---
 chapter05/gcc-pass1.xml | 8 --------
 chapter06/gcc-pass2.xml | 9 ---------
 chapter08/gcc.xml       | 8 --------
 3 files changed, 25 deletions(-)

diff --git a/chapter05/gcc-pass1.xml b/chapter05/gcc-pass1.xml
index 31280ad18..47ca6d1b4 100644
--- a/chapter05/gcc-pass1.xml
+++ b/chapter05/gcc-pass1.xml
@@ -43,14 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Cross GCC</title>
 
-    <!-- https://gcc.gnu.org/r14-4674 -->
-    <para>At first, fix an issue producing illegal instructions in linked
-    executables and shared libraries with GCC &gcc-version; and
-    Binutils-2.42:</para>
-
-    <screen><userinput remap='pre'>sed -e '/ASM_OUTPUT_ALIGN_WITH_NOP/,+1d' \
-    -i gcc/config/loongarch/loongarch.h</userinput></screen>
-
     <para>GCC requires the GMP, MPFR and MPC packages. As these packages may
     not be included in your host distribution, they will be built with
     GCC.  Unpack each package into the GCC source directory and rename the
diff --git a/chapter06/gcc-pass2.xml b/chapter06/gcc-pass2.xml
index 991f9195b..e8ed0d1c1 100644
--- a/chapter06/gcc-pass2.xml
+++ b/chapter06/gcc-pass2.xml
@@ -47,15 +47,6 @@
 
     <screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-fixes-patch;</userinput></screen>
 -->
-
-    <!-- https://gcc.gnu.org/r14-4674 -->
-    <para>Again, fix an issue producing illegal instructions in linked
-    executables and shared libraries with GCC &gcc-version; and
-    Binutils-2.42:</para>
-
-    <screen><userinput remap='pre'>sed -e '/ASM_OUTPUT_ALIGN_WITH_NOP/,+1d' \
-    -i gcc/config/loongarch/loongarch.h</userinput></screen>
-
     <para>As in the first build of GCC, the GMP, MPFR, and MPC packages are
     required. Unpack the tarballs and move them into the required directories:</para>
 
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 3e0ae8391..c1f6b607f 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -41,14 +41,6 @@
   <sect2 role="installation">
     <title>Installation of GCC</title>
 
-    <!-- https://gcc.gnu.org/r14-4674 -->
-    <para>Again, fix an issue producing illegal instructions in linked
-    executables and shared libraries with GCC &gcc-version; and
-    Binutils-2.42:</para>
-
-    <screen><userinput remap='pre'>sed -e '/ASM_OUTPUT_ALIGN_WITH_NOP/,+1d' \
-    -i gcc/config/loongarch/loongarch.h</userinput></screen>
-
     <para>Set the default directory name for
     64-bit libraries to <quote>lib</quote>:</para>