commit:     197e29d2004d6ca3605f441580c19b41fddb9a4b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  3 09:07:27 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov  3 09:07:27 2025 +0000
URL:        
https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=197e29d2

9999: rebase

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...iberty-install-PIC-version-of-libiberty.a.patch |  8 +++--
 ...oo-add-with-extra-soversion-suffix-option.patch | 42 ++++++++++++++--------
 ...-also-libctf-optionally-a-gentoo-specific.patch | 38 ++++++++++++++------
 ...ilar-libiberty-fix-as-in-7d53105d-for-lib.patch | 32 +++++++++++------
 4 files changed, 82 insertions(+), 38 deletions(-)

diff --git 
a/9999/0001-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch 
b/9999/0001-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch
index a1e4219..c516599 100644
--- a/9999/0001-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch
+++ b/9999/0001-Gentoo-libiberty-install-PIC-version-of-libiberty.a.patch
@@ -1,5 +1,5 @@
-From 4ebcb339f9d678aef53596022a3e6125dfed109a Mon Sep 17 00:00:00 2001
-Message-ID: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
+From 2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09 Mon Sep 17 00:00:00 2001
+Message-ID: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
 From: Mike Frysinger <[email protected]>
 Date: Fri, 7 Jan 2005 00:15:53 -0500
 Subject: [PATCH 1/4] Gentoo: libiberty: install PIC version of libiberty.a
@@ -30,6 +30,8 @@ index d507f27a9ef..51fefcb31c2 100644
          cd ..; \
        else true; fi; \
        if [ x"$(NOASANFLAG)" != x ]; then \
+
+base-commit: ef442f8e7f1db571d0a6a1ea0c01e8debb0ea4e7
 -- 
-2.51.0
+2.51.2
 

diff --git a/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch 
b/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch
index 10b4901..bfee380 100644
--- a/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch
+++ b/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch
@@ -1,7 +1,7 @@
-From 366a426d48c8ef40810ff0d275b73f86243d50f5 Mon Sep 17 00:00:00 2001
-Message-ID: 
<366a426d48c8ef40810ff0d275b73f86243d50f5.1758805647.git....@gentoo.org>
-In-Reply-To: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
-References: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
+From c36545a2592823130ca8054abcc8d308426f8056 Mon Sep 17 00:00:00 2001
+Message-ID: 
<c36545a2592823130ca8054abcc8d308426f8056.1762160821.git....@gentoo.org>
+In-Reply-To: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
+References: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
 From: Sergei Trofimovich <[email protected]>
 Date: Tue, 20 Jul 2021 21:12:38 +0200
 Subject: [PATCH 2/4] Gentoo: add --with-extra-soversion-suffix= option
@@ -32,9 +32,10 @@ Ported to binutils 2.37 by Andreas K. Hüttel 
<[email protected]>
 ---
  bfd/Makefile.am  |  5 +++++
  bfd/Makefile.in  |  4 ++++
+ bfd/compress.c   |  2 +-
  bfd/configure    | 17 +++++++++++++++--
  bfd/configure.ac |  7 +++++++
- 4 files changed, 31 insertions(+), 2 deletions(-)
+ 5 files changed, 32 insertions(+), 3 deletions(-)
 
 diff --git a/bfd/Makefile.am b/bfd/Makefile.am
 index 3c3243269f1..719d5f2bb52 100644
@@ -81,8 +82,21 @@ index 6d1944c2664..07b1084f6b7 100644
        $(SED) -e "s,@bfd_version@,$$bfd_version," \
            -e "s,@bfd_version_string@,$$bfd_version_string," \
            -e "s,@bfd_version_package@,$$bfd_version_package," \
+diff --git a/bfd/compress.c b/bfd/compress.c
+index 28788370210..3badf1e5896 100644
+--- a/bfd/compress.c
++++ b/bfd/compress.c
+@@ -641,7 +641,7 @@ bfd_compress_section_contents (bfd *abfd, sec_ptr sec)
+                                          compressed_size,
+                                          input_buffer,
+                                          uncompressed_size,
+-                                         ZSTD_CLEVEL_DEFAULT);
++                                         19);
+         if (ZSTD_isError (compressed_size))
+           {
+             bfd_release (abfd, buffer);
 diff --git a/bfd/configure b/bfd/configure
-index d07f9e926e4..013353a2b59 100755
+index d9d77b7004c..f238da28e61 100755
 --- a/bfd/configure
 +++ b/bfd/configure
 @@ -701,6 +701,7 @@ WARN_CFLAGS
@@ -110,25 +124,25 @@ index d07f9e926e4..013353a2b59 100755
    --with-pkgversion=PKG   Use PKG in the version string in place of "GNU
                            Binutils"
    --with-bugurl=URL       Direct users to URL to report a bug
-@@ -11528,7 +11532,7 @@ else
+@@ -11527,7 +11531,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11531 "configure"
-+#line 11535 "configure"
+-#line 11530 "configure"
++#line 11534 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11634,7 +11638,7 @@ else
+@@ -11633,7 +11637,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 11637 "configure"
-+#line 11641 "configure"
+-#line 11636 "configure"
++#line 11640 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -12394,6 +12398,15 @@ fi
+@@ -12393,6 +12397,15 @@ fi
  
  
  
@@ -163,5 +177,5 @@ index 4fb3bf41f34..b52eba399f1 100644
  ACX_BUGURL([https://sourceware.org/bugzilla/])
  
 -- 
-2.51.0
+2.51.2
 

diff --git 
a/9999/0003-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch 
b/9999/0003-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch
index 81d3d05..71d7e84 100644
--- a/9999/0003-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch
+++ b/9999/0003-Gentoo-Give-also-libctf-optionally-a-gentoo-specific.patch
@@ -1,7 +1,7 @@
-From 07128aa7ebc4a73170d4cebc036c9c64b7529f6e Mon Sep 17 00:00:00 2001
-Message-ID: 
<07128aa7ebc4a73170d4cebc036c9c64b7529f6e.1758805647.git....@gentoo.org>
-In-Reply-To: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
-References: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
+From b9c274238390aaa895ea4dbb94c607dac83bb43e Mon Sep 17 00:00:00 2001
+Message-ID: 
<b9c274238390aaa895ea4dbb94c607dac83bb43e.1762160821.git....@gentoo.org>
+In-Reply-To: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
+References: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]>
 Date: Sat, 24 Jul 2021 15:20:16 +0200
 Subject: [PATCH 3/4] Gentoo: Give also libctf optionally a gentoo-specific
@@ -10,9 +10,9 @@ Subject: [PATCH 3/4] Gentoo: Give also libctf optionally a 
gentoo-specific
 ---
  libctf/Makefile.am  | 14 +++++++++++++-
  libctf/Makefile.in  |  9 ++++++++-
- libctf/configure    | 31 +++++++++++++++++++++++++++++++
+ libctf/configure    | 35 +++++++++++++++++++++++++++++++++--
  libctf/configure.ac | 10 ++++++++++
- 4 files changed, 62 insertions(+), 2 deletions(-)
+ 4 files changed, 64 insertions(+), 4 deletions(-)
 
 diff --git a/libctf/Makefile.am b/libctf/Makefile.am
 index 6e136220497..12301277275 100644
@@ -83,7 +83,7 @@ index 7c309b1fc04..c71e22d1b72 100644
  libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1
  libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c \
 diff --git a/libctf/configure b/libctf/configure
-index becb131103a..5179121719c 100755
+index 1b02c399dd9..d918965e234 100755
 --- a/libctf/configure
 +++ b/libctf/configure
 @@ -646,6 +646,10 @@ BUILD_INFO_FALSE
@@ -114,7 +114,25 @@ index becb131103a..5179121719c 100755
  
  Some influential environment variables:
    CC          C compiler command
-@@ -16657,6 +16664,26 @@ else
+@@ -13970,7 +13977,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 13973 "configure"
++#line 13980 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14076,7 +14083,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 14079 "configure"
++#line 14086 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -16656,6 +16663,26 @@ else
  fi
  
  
@@ -141,7 +159,7 @@ index becb131103a..5179121719c 100755
  # Similar to GDB_AC_CHECK_BFD.
  OLD_CFLAGS=$CFLAGS
  OLD_LDFLAGS=$LDFLAGS
-@@ -17560,6 +17587,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && 
test -z "${ENABLE_LIBCTF_HA
+@@ -17559,6 +17586,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && 
test -z "${ENABLE_LIBCTF_HA
    as_fn_error $? "conditional \"ENABLE_LIBCTF_HASH_DEBUGGING\" was never 
defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -174,5 +192,5 @@ index 62e62250c80..5266b1381df 100644
  OLD_CFLAGS=$CFLAGS
  OLD_LDFLAGS=$LDFLAGS
 -- 
-2.51.0
+2.51.2
 

diff --git 
a/9999/0004-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch 
b/9999/0004-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch
index f59e780..dfc91d3 100644
--- a/9999/0004-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch
+++ b/9999/0004-Apply-a-similar-libiberty-fix-as-in-7d53105d-for-lib.patch
@@ -1,7 +1,7 @@
-From c888b2e67d8e45c20aac1912ff9cd34cbea48d9e Mon Sep 17 00:00:00 2001
-Message-ID: 
<c888b2e67d8e45c20aac1912ff9cd34cbea48d9e.1758805647.git....@gentoo.org>
-In-Reply-To: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
-References: 
<4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org>
+From cd3fc7df6701016e577df8d1c3a02aba0d5ac42b Mon Sep 17 00:00:00 2001
+Message-ID: 
<cd3fc7df6701016e577df8d1c3a02aba0d5ac42b.1762160821.git....@gentoo.org>
+In-Reply-To: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
+References: 
<2417d4ce6d1ab1c54d0b384f8d2d98a4b8545b09.1762160821.git....@gentoo.org>
 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]>
 Date: Wed, 22 Feb 2023 20:05:35 +0100
 Subject: [PATCH 4/4] Apply a similar libiberty fix as in 7d53105d for
@@ -15,10 +15,10 @@ Bug: https://bugs.gentoo.org/834720
 Signed-off-by: Andreas K. Hüttel <[email protected]>
 ---
  gprofng/src/Makefile.am | 3 ++-
- gprofng/src/Makefile.in | 3 ++-
+ gprofng/src/Makefile.in | 6 ++++--
  opcodes/configure       | 4 ++--
  opcodes/configure.ac    | 4 ++--
- 4 files changed, 8 insertions(+), 6 deletions(-)
+ 4 files changed, 10 insertions(+), 7 deletions(-)
 
 diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am
 index f6d3f5da759..36c334bb359 100644
@@ -35,10 +35,20 @@ index f6d3f5da759..36c334bb359 100644
        $(GPROFNG_LIBADD) \
        -lpthread -ldl
 diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
-index 0a1934e8344..374a887adae 100644
+index 0a1934e8344..adf178c7f6a 100644
 --- a/gprofng/src/Makefile.in
 +++ b/gprofng/src/Makefile.in
-@@ -558,7 +558,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0
+@@ -164,7 +164,8 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
"$(DESTDIR)$(bindir)" \
+       "$(DESTDIR)$(dbedir)"
+ LTLIBRARIES = $(lib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgprofng_la_DEPENDENCIES = $(top_builddir)/../opcodes/libopcodes.la \
++libgprofng_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++      $(top_builddir)/../opcodes/libopcodes.la \
+       $(top_builddir)/../bfd/libbfd.la $(am__DEPENDENCIES_1)
+ am__objects_1 = Application.lo BaseMetric.lo BaseMetricTreeNode.lo \
+       CallStack.lo CatchOutOfMemory.lo ClassFile.lo Command.lo \
+@@ -558,7 +559,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0
  # Pass -lpthread instead of $(PTHREAD_LIBS) due to $(PTHREAD_LIBS) being empty
  # when -nostdlib is passed to libtool.
  # See bug 29364 - libgprofng.so: needs to link against -pthread
@@ -49,10 +59,10 @@ index 0a1934e8344..374a887adae 100644
        $(GPROFNG_LIBADD) \
        -lpthread -ldl
 diff --git a/opcodes/configure b/opcodes/configure
-index df9f63d1031..8c46bcf79ba 100755
+index 48c53a2ff2b..6bdc4623969 100755
 --- a/opcodes/configure
 +++ b/opcodes/configure
-@@ -14256,10 +14256,10 @@ if test "$enable_shared" = "yes"; then
+@@ -14255,10 +14255,10 @@ if test "$enable_shared" = "yes"; then
    case "${host}" in
      *-*-cygwin*)
        SHARED_LDFLAGS="-no-undefined"
@@ -83,5 +93,5 @@ index 675f0662700..0220ec13312 100644
        ;;
    esac
 -- 
-2.51.0
+2.51.2
 

Reply via email to