commit:     8508e7cf1cd32da1b69f78cbae93a3030b2deca1
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May  9 08:47:49 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May  9 09:53:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8508e7cf

sys-devel/binutils-hppa64: remove unused patch(es)

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 .../files/binutils-hppa64-2.35.1-cet.patch         | 103 ---------------------
 .../files/binutils-hppa64-2.36.1-bfd-ctf.patch     |  68 --------------
 .../files/binutils-hppa64-2.36.1-ld-ctf.patch      |  48 ----------
 3 files changed, 219 deletions(-)

diff --git a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch 
b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch
deleted file mode 100644
index 7477ff90ac9..00000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.35.1-cet.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-https://bugs.gentoo.org/771765
-https://sourceware.org/PR27397
-
-On i586-like CPUs endbr32 added by -Wl,-z,ibt,-z,shstk
-generates crashing binaries and causes ./configure failure.
-
-From 847e4b3207f97762dc641db8d3b188081c3370c3 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.to...@gmail.com>
-Date: Fri, 12 Feb 2021 16:30:23 -0800
-Subject: [PATCH] GCC_CET_HOST_FLAGS: Check if host supports multi-byte NOPs
-
----
- config/cet.m4       | 19 ++++++++++++++++---
- libiberty/configure | 29 +++++++++++++++++++++++++++++
- 2 files changed, 45 insertions(+), 3 deletions(-)
-
-diff --git a/config/cet.m4 b/config/cet.m4
-index c67fb4f35b6..7718be1afe8 100644
---- a/config/cet.m4
-+++ b/config/cet.m4
-@@ -130,6 +130,18 @@ fi
- if test x$may_have_cet = xyes; then
-   if test x$cross_compiling = xno; then
-     AC_TRY_RUN([
-+int
-+main ()
-+{
-+  asm ("endbr32");
-+  return 0;
-+}
-+    ],
-+    [have_multi_byte_nop=yes],
-+    [have_multi_byte_nop=no])
-+    have_cet=no
-+    if test x$have_multi_byte_nop = xyes; then
-+      AC_TRY_RUN([
- static void
- foo (void)
- {
-@@ -155,9 +167,10 @@ main ()
-   bar ();
-   return 0;
- }
--    ],
--    [have_cet=no],
--    [have_cet=yes])
-+      ],
-+      [have_cet=no],
-+      [have_cet=yes])
-+    fi
-     if test x$enable_cet = xno -a x$have_cet = xyes; then
-       AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
-     fi
-diff --git a/libiberty/configure b/libiberty/configure
-index 160b8c9e8b1..29a690d44fc 100755
---- a/libiberty/configure
-+++ b/libiberty/configure
-@@ -5539,6 +5539,34 @@ else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+int
-+main ()
-+{
-+  asm ("endbr32");
-+  return 0;
-+}
-+
-+_ACEOF
-+if ac_fn_c_try_run "$LINENO"; then :
-+  have_multi_byte_nop=yes
-+else
-+  have_multi_byte_nop=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+    have_cet=no
-+    if test x$have_multi_byte_nop = xyes; then
-+      if test "$cross_compiling" = yes; then :
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error $? "cannot run test program while cross compiling
-+See \`config.log' for more details" "$LINENO" 5; }
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
- static void
- foo (void)
- {
-@@ -5575,6 +5603,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out 
conftest$ac_exeext \
-   conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
-+    fi
-     if test x$enable_cet = xno -a x$have_cet = xyes; then
-       as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" 
"$LINENO" 5
-     fi
--- 
-2.29.2
-

diff --git 
a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch 
b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch
deleted file mode 100644
index d7daf683669..00000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-bfd-ctf.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=755ba58ebef02e1be9fc6770d00243ba6ed0223c
-https://bugs.gentoo.org/783777
-
-From 755ba58ebef02e1be9fc6770d00243ba6ed0223c Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alc...@oracle.com>
-Date: Thu, 18 Mar 2021 12:37:52 +0000
-Subject: [PATCH] Add install dependencies for ld -> bfd and libctf -> bfd
-
-This stops problems parallel-installing if a relink of libctf is needed.
-
-Also adds corresponding install-strip dependencies.
-
-ChangeLog
-2021-03-18  Nick Alcock  <nick.alc...@oracle.com>
-
-       PR libctf/27482
-       * Makefile.def: Add install-bfd dependencies for install-libctf and
-       install-ld, and install-strip-bfd dependencies for
-       install-strip-libctf and install-strip-ld; move the install-ld
-       dependency on install-libctf to join it.
-       * Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,7 +448,6 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
--dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
-@@ -456,6 +455,14 @@ dependencies = { module=install-ld; on=install-libctf; };
- dependencies = { module=install-binutils; on=install-opcodes; };
- dependencies = { module=install-strip-binutils; on=install-strip-opcodes; };
- 
-+// Likewise for ld, libctf, and bfd.
-+dependencies = { module=install-libctf; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-bfd; };
-+dependencies = { module=install-ld; on=install-libctf; };
-+dependencies = { module=install-strip-libctf; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-bfd; };
-+dependencies = { module=install-strip-ld; on=install-strip-libctf; };
-+
- // libopcodes depends on libbfd
- dependencies = { module=install-opcodes; on=install-bfd; };
- dependencies = { module=install-strip-opcodes; on=install-strip-bfd; };
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,9 +52170,14 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
--install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
-+install-libctf: maybe-install-bfd
-+install-ld: maybe-install-bfd
-+install-ld: maybe-install-libctf
-+install-strip-libctf: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-bfd
-+install-strip-ld: maybe-install-strip-libctf
- install-opcodes: maybe-install-bfd
- install-strip-opcodes: maybe-install-strip-bfd
- configure-gas: maybe-configure-intl
--- 
-2.27.0
-

diff --git 
a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch 
b/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch
deleted file mode 100644
index 012df3aed81..00000000000
--- a/sys-devel/binutils-hppa64/files/binutils-hppa64-2.36.1-ld-ctf.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=f04ce15e831b691d7610dba284e266919e757b10
-https://bugs.gentoo.org/783777
-
-From f04ce15e831b691d7610dba284e266919e757b10 Mon Sep 17 00:00:00 2001
-From: Nick Alcock <nick.alc...@oracle.com>
-Date: Tue, 26 Jan 2021 16:05:17 +0000
-Subject: [PATCH] ld: depend on libctf
-
-Since ld may depend on libctf (if present), and libctf may be relinked
-by the installation process, libctf must be installed before ld is,
-or the relink may fail if it calls on symbols or symbol versions that do
-not exist in any libctf already present on the system.  (If none is
-present, the copy in the build tree will be automatically used, but
-if one *is* present, it may take precedence and break things.)
-
-(This is a maybe- dependency, so it will work even if libctf is
-disabled.)
-
-ChangeLog
-2021-01-26  Nick Alcock  <nick.alc...@oracle.com>
-
-       PR 27250
-       * Makefile.def: Add install-libctf dependency to install-ld.
-       * Makefile.in: Regenerated.
----
---- a/Makefile.def
-+++ b/Makefile.def
-@@ -448,6 +448,7 @@ dependencies = { module=all-binutils; on=all-intl; };
- dependencies = { module=all-binutils; on=all-gas; };
- dependencies = { module=all-binutils; on=all-libctf; };
- dependencies = { module=all-ld; on=all-libctf; };
-+dependencies = { module=install-ld; on=install-libctf; };
- 
- // We put install-opcodes before install-binutils because the installed
- // binutils might be on PATH, and they might need the shared opcodes
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -52170,6 +52170,7 @@ all-stage3-ld: maybe-all-stage3-libctf
- all-stage4-ld: maybe-all-stage4-libctf
- all-stageprofile-ld: maybe-all-stageprofile-libctf
- all-stagefeedback-ld: maybe-all-stagefeedback-libctf
-+install-ld: maybe-install-libctf
- install-binutils: maybe-install-opcodes
- install-strip-binutils: maybe-install-strip-opcodes
- install-opcodes: maybe-install-bfd
--- 
-2.27.0
-

Reply via email to