commit: 91244bb530ce9cd3f6936d078b35af8844322872 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Sep 25 13:07:51 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Sep 25 13:07:51 2025 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=91244bb5
9999: rebase patches Signed-off-by: Sam James <sam <AT> gentoo.org> ...iberty-install-PIC-version-of-libiberty.a.patch | 7 ++-- ...oo-add-with-extra-soversion-suffix-option.patch | 41 ++++++++++++---------- ...-also-libctf-optionally-a-gentoo-specific.patch | 31 ++++++++-------- ...ilar-libiberty-fix-as-in-7d53105d-for-lib.patch | 21 ++++++----- 4 files changed, 55 insertions(+), 45 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 3ff9191..a1e4219 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,7 +1,8 @@ -From bd82239c2a628ace1b6fddcec96871641fadfbec Mon Sep 17 00:00:00 2001 +From 4ebcb339f9d678aef53596022a3e6125dfed109a Mon Sep 17 00:00:00 2001 +Message-ID: <4ebcb339f9d678aef53596022a3e6125dfed109a.1758805647.git....@gentoo.org> From: Mike Frysinger <[email protected]> Date: Fri, 7 Jan 2005 00:15:53 -0500 -Subject: [PATCH 1/5] Gentoo: libiberty: install PIC version of libiberty.a +Subject: [PATCH 1/4] Gentoo: libiberty: install PIC version of libiberty.a This will install a PIC version of libiberty.a by overwriting the non-PIC version of libiberty.a while compiling. We do this because there is no @@ -30,5 +31,5 @@ index d507f27a9ef..51fefcb31c2 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.49.1 +2.51.0 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 a1a35fd..10b4901 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,10 @@ -From 062144ba260931e309a621355b92a2ca3b1ec12c Mon Sep 17 00:00:00 2001 +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: Sergei Trofimovich <[email protected]> Date: Tue, 20 Jul 2021 21:12:38 +0200 -Subject: [PATCH 2/5] Gentoo: add --with-extra-soversion-suffix= option +Subject: [PATCH 2/4] Gentoo: add --with-extra-soversion-suffix= option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -34,7 +37,7 @@ Ported to binutils 2.37 by Andreas K. Hüttel <[email protected]> 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am -index 4987ac9cccc..23de1c6b5d7 100644 +index 3c3243269f1..719d5f2bb52 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -64,6 +64,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -46,7 +49,7 @@ index 4987ac9cccc..23de1c6b5d7 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -995,6 +997,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -993,6 +995,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ fi ;\ @@ -57,10 +60,10 @@ index 4987ac9cccc..23de1c6b5d7 100644 -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/Makefile.in b/bfd/Makefile.in -index 8a670ad1d05..2218f61e604 100644 +index 6d1944c2664..07b1084f6b7 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -347,6 +347,7 @@ ECHO_T = @ECHO_T@ +@@ -349,6 +349,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ @@ -79,7 +82,7 @@ index 8a670ad1d05..2218f61e604 100644 -e "s,@bfd_version_string@,$$bfd_version_string," \ -e "s,@bfd_version_package@,$$bfd_version_package," \ diff --git a/bfd/configure b/bfd/configure -index 86561b30ac4..317c2f44982 100755 +index d07f9e926e4..013353a2b59 100755 --- a/bfd/configure +++ b/bfd/configure @@ -701,6 +701,7 @@ WARN_CFLAGS @@ -90,7 +93,7 @@ index 86561b30ac4..317c2f44982 100755 DEBUGDIR PLUGINS_FALSE PLUGINS_TRUE -@@ -840,6 +841,7 @@ enable_secureplt +@@ -841,6 +842,7 @@ enable_secureplt enable_separate_code enable_leading_mingw64_underscores with_separate_debug_dir @@ -98,7 +101,7 @@ index 86561b30ac4..317c2f44982 100755 with_pkgversion with_bugurl enable_werror -@@ -1528,6 +1530,8 @@ Optional Packages: +@@ -1529,6 +1531,8 @@ Optional Packages: --with-separate-debug-dir=DIR Look for global separate debug info in DIR [[default=LIBDIR/debug]] @@ -107,25 +110,25 @@ index 86561b30ac4..317c2f44982 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 -@@ -11153,7 +11157,7 @@ else +@@ -11528,7 +11532,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11156 "configure" -+#line 11160 "configure" +-#line 11531 "configure" ++#line 11535 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -11259,7 +11263,7 @@ else +@@ -11634,7 +11638,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF --#line 11262 "configure" -+#line 11266 "configure" +-#line 11637 "configure" ++#line 11641 "configure" #include "confdefs.h" #if HAVE_DLFCN_H -@@ -12030,6 +12034,15 @@ fi +@@ -12394,6 +12398,15 @@ fi @@ -142,10 +145,10 @@ index 86561b30ac4..317c2f44982 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index 5879a04785d..3e40e9476a7 100644 +index 4fb3bf41f34..b52eba399f1 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -173,6 +173,13 @@ AC_ARG_WITH(separate-debug-dir, +@@ -163,6 +163,13 @@ AC_ARG_WITH(separate-debug-dir, [DEBUGDIR="${withval}"]) AC_SUBST(DEBUGDIR) @@ -160,5 +163,5 @@ index 5879a04785d..3e40e9476a7 100644 ACX_BUGURL([https://sourceware.org/bugzilla/]) -- -2.49.1 +2.51.0 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 7a73c68..81d3d05 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,10 @@ -From ef7b999d6d7748f0b6e159df52b4b663e5032072 Mon Sep 17 00:00:00 2001 +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: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> Date: Sat, 24 Jul 2021 15:20:16 +0200 -Subject: [PATCH 3/5] Gentoo: Give also libctf optionally a gentoo-specific +Subject: [PATCH 3/4] Gentoo: Give also libctf optionally a gentoo-specific soversion --- @@ -45,10 +48,10 @@ index 6e136220497..12301277275 100644 libctf_nobfd_la_CPPFLAGS = $(AM_CPPFLAGS) -DNOBFD=1 libctf_nobfd_la_SOURCES = ctf-archive.c ctf-dump.c ctf-create.c ctf-decl.c ctf-error.c \ diff --git a/libctf/Makefile.in b/libctf/Makefile.in -index 5d9587766dc..639d7147b02 100644 +index 7c309b1fc04..c71e22d1b72 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -430,6 +430,7 @@ AUTOCONF = @AUTOCONF@ +@@ -432,6 +432,7 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ @@ -56,7 +59,7 @@ index 5d9587766dc..639d7147b02 100644 CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ -@@ -452,6 +453,7 @@ EXEEXT = @EXEEXT@ +@@ -454,6 +455,7 @@ EXEEXT = @EXEEXT@ # Setup the testing framework, if you have one EXPECT = expect @@ -64,7 +67,7 @@ index 5d9587766dc..639d7147b02 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -603,8 +605,13 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ +@@ -606,8 +608,13 @@ AM_CFLAGS = -std=gnu99 @ac_libctf_warn_cflags@ @warn@ @c_warn@ @WARN_PEDANTIC@ @ @INSTALL_LIBBFD_FALSE@include_HEADERS = @INSTALL_LIBBFD_TRUE@include_HEADERS = $(INCDIR)/ctf.h $(INCDIR)/ctf-api.h @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libctf.la libctf-nobfd.la @@ -80,7 +83,7 @@ index 5d9587766dc..639d7147b02 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 7466d56a18b..54c86592b70 100755 +index becb131103a..5179121719c 100755 --- a/libctf/configure +++ b/libctf/configure @@ -646,6 +646,10 @@ BUILD_INFO_FALSE @@ -94,7 +97,7 @@ index 7466d56a18b..54c86592b70 100755 ENABLE_LIBCTF_HASH_DEBUGGING_FALSE ENABLE_LIBCTF_HASH_DEBUGGING_TRUE zlibinc -@@ -821,6 +825,7 @@ enable_maintainer_mode +@@ -822,6 +826,7 @@ enable_maintainer_mode enable_install_libbfd with_system_zlib enable_libctf_hash_debugging @@ -102,7 +105,7 @@ index 7466d56a18b..54c86592b70 100755 ' ac_precious_vars='build_alias host_alias -@@ -1487,6 +1492,8 @@ Optional Packages: +@@ -1488,6 +1493,8 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-system-zlib use installed libz @@ -111,7 +114,7 @@ index 7466d56a18b..54c86592b70 100755 Some influential environment variables: CC C compiler command -@@ -16274,6 +16281,26 @@ else +@@ -16657,6 +16664,26 @@ else fi @@ -138,7 +141,7 @@ index 7466d56a18b..54c86592b70 100755 # Similar to GDB_AC_CHECK_BFD. OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -@@ -17177,6 +17204,10 @@ if test -z "${ENABLE_LIBCTF_HASH_DEBUGGING_TRUE}" && test -z "${ENABLE_LIBCTF_HA +@@ -17560,6 +17587,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 @@ -150,10 +153,10 @@ index 7466d56a18b..54c86592b70 100755 if test -z "${NEED_CTF_QSORT_R_TRUE}" && test -z "${NEED_CTF_QSORT_R_FALSE}"; then as_fn_error $? "conditional \"NEED_CTF_QSORT_R\" was never defined. diff --git a/libctf/configure.ac b/libctf/configure.ac -index fbd8ec12a14..3e83f43ba13 100644 +index 62e62250c80..5266b1381df 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac -@@ -76,6 +76,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then +@@ -84,6 +84,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then fi AM_CONDITIONAL(ENABLE_LIBCTF_HASH_DEBUGGING, test "${enable_libctf_hash_debugging}" = yes) @@ -171,5 +174,5 @@ index fbd8ec12a14..3e83f43ba13 100644 OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -- -2.49.1 +2.51.0 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 bb17a3b..f59e780 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,10 @@ -From 845089ce66869d79e86869ec1972a33036010706 Mon Sep 17 00:00:00 2001 +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: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> Date: Wed, 22 Feb 2023 20:05:35 +0100 -Subject: [PATCH 4/5] Apply a similar libiberty fix as in 7d53105d for +Subject: [PATCH 4/4] Apply a similar libiberty fix as in 7d53105d for libopcodes and libgprofng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -32,10 +35,10 @@ index f6d3f5da759..36c334bb359 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index 0cdd4443670..8021b2d4a3d 100644 +index 0a1934e8344..374a887adae 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in -@@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 +@@ -558,7 +558,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 @@ -46,10 +49,10 @@ index 0cdd4443670..8021b2d4a3d 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/opcodes/configure b/opcodes/configure -index 3dd6b692f89..54544895689 100755 +index df9f63d1031..8c46bcf79ba 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -13881,10 +13881,10 @@ if test "$enable_shared" = "yes"; then +@@ -14256,10 +14256,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" @@ -63,10 +66,10 @@ index 3dd6b692f89..54544895689 100755 ;; esac diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index e31ddde9e57..8fdf538ecf8 100644 +index 675f0662700..0220ec13312 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -195,10 +195,10 @@ if test "$enable_shared" = "yes"; then +@@ -194,10 +194,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" @@ -80,5 +83,5 @@ index e31ddde9e57..8fdf538ecf8 100644 ;; esac -- -2.49.1 +2.51.0
