commit: 45a5900d24f054ee4a32159c67bb4c9f58df05d2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Jul 28 12:24:26 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Jul 28 12:24:26 2025 +0000 URL: https://gitweb.gentoo.org/proj/toolchain/binutils-patches.git/commit/?id=45a5900d
Rebase patches for binutils-2.45 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> ...iberty-install-PIC-version-of-libiberty.a.patch | 8 ++-- ...oo-add-with-extra-soversion-suffix-option.patch | 54 ++++++++++++++-------- ...-also-libctf-optionally-a-gentoo-specific.patch | 10 ++-- ...ilar-libiberty-fix-as-in-7d53105d-for-lib.patch | 16 +++---- ...-Adjust-testsuites-for-flto-and-without-g.patch | 25 ++++------ 5 files changed, 63 insertions(+), 50 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 34afb9b..3ff9191 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,4 +1,4 @@ -From a40f75efe4a34fbb447a026a52202b415013a984 Mon Sep 17 00:00:00 2001 +From bd82239c2a628ace1b6fddcec96871641fadfbec Mon Sep 17 00:00:00 2001 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 @@ -18,10 +18,10 @@ general are fairly low, and we'd rather have things work for all of them. 1 file changed, 1 insertion(+) diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index b77a41c781c..5e3725d16ff 100644 +index d507f27a9ef..51fefcb31c2 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in -@@ -258,6 +258,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) +@@ -260,6 +260,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS) $(AR) $(AR_FLAGS) $(TARGETLIB) \ $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \ $(RANLIB) $(TARGETLIB); \ @@ -30,5 +30,5 @@ index b77a41c781c..5e3725d16ff 100644 else true; fi; \ if [ x"$(NOASANFLAG)" != x ]; then \ -- -2.44.2 +2.49.1 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 e7e4ae8..a1a35fd 100644 --- a/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch +++ b/9999/0002-Gentoo-add-with-extra-soversion-suffix-option.patch @@ -1,4 +1,4 @@ -From 87a5dd82a8e08967694943e866aa9b26c4fc6a63 Mon Sep 17 00:00:00 2001 +From 062144ba260931e309a621355b92a2ca3b1ec12c Mon Sep 17 00:00:00 2001 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 @@ -29,12 +29,12 @@ Ported to binutils 2.37 by Andreas K. Hüttel <[email protected]> --- bfd/Makefile.am | 5 +++++ bfd/Makefile.in | 4 ++++ - bfd/configure | 13 +++++++++++++ + bfd/configure | 17 +++++++++++++++-- bfd/configure.ac | 7 +++++++ - 4 files changed, 29 insertions(+) + 4 files changed, 31 insertions(+), 2 deletions(-) diff --git a/bfd/Makefile.am b/bfd/Makefile.am -index 0dc733eaba9..5bd636d931a 100644 +index 4987ac9cccc..23de1c6b5d7 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -64,6 +64,8 @@ bfdinclude_HEADERS += $(INCDIR)/plugin-api.h @@ -46,7 +46,7 @@ index 0dc733eaba9..5bd636d931a 100644 # bfd.h goes here, for now BFD_H = bfd.h -@@ -999,6 +1001,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -995,6 +997,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 +57,10 @@ index 0dc733eaba9..5bd636d931a 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 b3d97d478ea..38209d1b234 100644 +index 8a670ad1d05..2218f61e604 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in -@@ -348,6 +348,7 @@ ECHO_T = @ECHO_T@ +@@ -347,6 +347,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ @@ -68,7 +68,7 @@ index b3d97d478ea..38209d1b234 100644 FGREP = @FGREP@ GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ -@@ -2471,6 +2472,9 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in +@@ -2464,6 +2465,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 ;\ @@ -79,7 +79,7 @@ index b3d97d478ea..38209d1b234 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 83cb19c7015..a60c76319b9 100755 +index 86561b30ac4..317c2f44982 100755 --- a/bfd/configure +++ b/bfd/configure @@ -701,6 +701,7 @@ WARN_CFLAGS @@ -88,9 +88,9 @@ index 83cb19c7015..a60c76319b9 100755 PKGVERSION +EXTRA_SOVERSION_SUFFIX DEBUGDIR - ENABLE_BFD_64_BIT_FALSE - ENABLE_BFD_64_BIT_TRUE -@@ -842,6 +843,7 @@ enable_secureplt + PLUGINS_FALSE + PLUGINS_TRUE +@@ -840,6 +841,7 @@ enable_secureplt enable_separate_code enable_leading_mingw64_underscores with_separate_debug_dir @@ -98,16 +98,34 @@ index 83cb19c7015..a60c76319b9 100755 with_pkgversion with_bugurl enable_werror -@@ -1530,6 +1532,8 @@ Optional Packages: +@@ -1528,6 +1530,8 @@ Optional Packages: --with-separate-debug-dir=DIR Look for global separate debug info in DIR [[default=LIBDIR/debug]] + --with-extra-soversion-suffix=SUFFIX -+ Append '.SUFFIX' to SONAME [default=] ++ Append '.SUFFIX' to SONAME [[default=]] --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 -@@ -12082,6 +12086,15 @@ fi +@@ -11153,7 +11157,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" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11259,7 +11263,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" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -12030,6 +12034,15 @@ fi @@ -124,10 +142,10 @@ index 83cb19c7015..a60c76319b9 100755 # Check whether --with-pkgversion was given. diff --git a/bfd/configure.ac b/bfd/configure.ac -index 6bcfd1b7368..dde0a3af03e 100644 +index 5879a04785d..3e40e9476a7 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -167,6 +167,13 @@ AC_ARG_WITH(separate-debug-dir, +@@ -173,6 +173,13 @@ AC_ARG_WITH(separate-debug-dir, [DEBUGDIR="${withval}"]) AC_SUBST(DEBUGDIR) @@ -142,5 +160,5 @@ index 6bcfd1b7368..dde0a3af03e 100644 ACX_BUGURL([https://sourceware.org/bugzilla/]) -- -2.44.2 +2.49.1 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 70c605a..7a73c68 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,4 +1,4 @@ -From 225a5f5b9f40c1f335146ec882bd5517e4573f62 Mon Sep 17 00:00:00 2001 +From ef7b999d6d7748f0b6e159df52b4b663e5032072 Mon Sep 17 00:00:00 2001 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 @@ -12,7 +12,7 @@ Subject: [PATCH 3/5] Gentoo: Give also libctf optionally a gentoo-specific 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/libctf/Makefile.am b/libctf/Makefile.am -index fb1a306c888..5fcc73bd04e 100644 +index 6e136220497..12301277275 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am @@ -31,6 +31,9 @@ info_TEXINFOS = @@ -45,7 +45,7 @@ index fb1a306c888..5fcc73bd04e 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 54f5daa79ee..b7a80edfab6 100644 +index 5d9587766dc..639d7147b02 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in @@ -430,6 +430,7 @@ AUTOCONF = @AUTOCONF@ @@ -150,7 +150,7 @@ 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 64544b83a9f..1ce43327c25 100644 +index fbd8ec12a14..3e83f43ba13 100644 --- a/libctf/configure.ac +++ b/libctf/configure.ac @@ -76,6 +76,16 @@ if test "${enable_libctf_hash_debugging}" = yes; then @@ -171,5 +171,5 @@ index 64544b83a9f..1ce43327c25 100644 OLD_CFLAGS=$CFLAGS OLD_LDFLAGS=$LDFLAGS -- -2.44.2 +2.49.1 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 54c7ba8..bb17a3b 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 24694fe84ea1ac172f709bd1b079ebb996e4feb9 Mon Sep 17 00:00:00 2001 +From 845089ce66869d79e86869ec1972a33036010706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <[email protected]> Date: Wed, 22 Feb 2023 20:05:35 +0100 -Subject: [PATCH 5/5] Apply a similar libiberty fix as in 7d53105d for +Subject: [PATCH 4/5] Apply a similar libiberty fix as in 7d53105d for libopcodes and libgprofng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -18,7 +18,7 @@ Signed-off-by: Andreas K. Hüttel <[email protected]> 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am -index fb4b8a0fafa..3d7cb18ff71 100644 +index f6d3f5da759..36c334bb359 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -144,7 +144,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -32,7 +32,7 @@ index fb4b8a0fafa..3d7cb18ff71 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in -index cef4b275305..295fd3ee2df 100644 +index 0cdd4443670..8021b2d4a3d 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -552,7 +552,8 @@ libgprofng_la_LDFLAGS = -version-info 0:0:0 @@ -46,10 +46,10 @@ index cef4b275305..295fd3ee2df 100644 $(GPROFNG_LIBADD) \ -lpthread -ldl diff --git a/opcodes/configure b/opcodes/configure -index 0075b6dc0ef..76fca3e9246 100755 +index 3dd6b692f89..54544895689 100755 --- a/opcodes/configure +++ b/opcodes/configure -@@ -14379,10 +14379,10 @@ if test "$enable_shared" = "yes"; then +@@ -13881,10 +13881,10 @@ if test "$enable_shared" = "yes"; then case "${host}" in *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" @@ -63,7 +63,7 @@ index 0075b6dc0ef..76fca3e9246 100755 ;; esac diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index 4d918e3ef9b..9692e69693e 100644 +index e31ddde9e57..8fdf538ecf8 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac @@ -195,10 +195,10 @@ if test "$enable_shared" = "yes"; then @@ -80,5 +80,5 @@ index 4d918e3ef9b..9692e69693e 100644 ;; esac -- -2.44.2 +2.49.1 diff --git a/9999/0005-Adjust-testsuites-for-flto-and-without-g.patch b/9999/0005-Adjust-testsuites-for-flto-and-without-g.patch index 20a8c62..e2735aa 100644 --- a/9999/0005-Adjust-testsuites-for-flto-and-without-g.patch +++ b/9999/0005-Adjust-testsuites-for-flto-and-without-g.patch @@ -1,8 +1,7 @@ -From f22ea3e751a11ab8cfb5524468d97a998cca0325 Mon Sep 17 00:00:00 2001 -Message-ID: <f22ea3e751a11ab8cfb5524468d97a998cca0325.1741810888.git....@gentoo.org> +From 3d6a0b4a3f6b0582781979062cc6730e858997ae Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <[email protected]> Date: Mon, 10 Mar 2025 17:07:16 -0700 -Subject: [PATCH] Adjust testsuites for -flto and without -g +Subject: [PATCH 5/5] Adjust testsuites for -flto and without -g Adjust testsuites for binutils built with -flto and without -g: @@ -50,16 +49,14 @@ libctf/ Signed-off-by: H.J. Lu <[email protected]> --- binutils/testsuite/binutils-all/objcopy.exp | 14 +++++++++++--- - gprof/testsuite/Makefile.am | 10 +++++----- - gprof/testsuite/Makefile.in | 12 +++++------- ld/testsuite/ld-ctf/ctf.exp | 5 +++++ libctf/Makefile.am | 3 ++- libctf/Makefile.in | 3 ++- libctf/testsuite/lib/ctf-lib.exp | 14 ++++++++++++-- - 7 files changed, 42 insertions(+), 19 deletions(-) + 5 files changed, 32 insertions(+), 7 deletions(-) diff --git a/binutils/testsuite/binutils-all/objcopy.exp b/binutils/testsuite/binutils-all/objcopy.exp -index a706efbba18..42a29927a5d 100644 +index 6aa6d2d9fe7..9371d928d60 100644 --- a/binutils/testsuite/binutils-all/objcopy.exp +++ b/binutils/testsuite/binutils-all/objcopy.exp @@ -36,6 +36,11 @@ if ![is_remote host] { @@ -100,7 +97,7 @@ index a706efbba18..42a29927a5d 100644 untested $test return } -@@ -1381,10 +1388,11 @@ proc objcopy_test_without_global_symbol { } { +@@ -1462,10 +1469,11 @@ proc objcopy_test_without_global_symbol { } { global OBJDUMPFLAGS global srcdir global subdir @@ -134,10 +131,10 @@ index c314f2995af..08b47d2db18 100644 + +set CFLAGS_FOR_TARGET "$old_CFLAGS" diff --git a/libctf/Makefile.am b/libctf/Makefile.am -index 6e136220497..bf214d8a000 100644 +index 12301277275..26980667cc3 100644 --- a/libctf/Makefile.am +++ b/libctf/Makefile.am -@@ -102,11 +102,12 @@ check-DEJAGNU: site.exp development.exp +@@ -114,11 +114,12 @@ check-DEJAGNU: site.exp development.exp else \ TEST_CROSS=yes; \ fi; \ @@ -152,10 +149,10 @@ index 6e136220497..bf214d8a000 100644 else echo "WARNING: could not find \`runtest'" 1>&2; :;\ fi diff --git a/libctf/Makefile.in b/libctf/Makefile.in -index 5d9587766dc..e5bb94c681b 100644 +index 639d7147b02..812134c70c9 100644 --- a/libctf/Makefile.in +++ b/libctf/Makefile.in -@@ -1819,11 +1819,12 @@ check-DEJAGNU: site.exp development.exp +@@ -1826,11 +1826,12 @@ check-DEJAGNU: site.exp development.exp else \ TEST_CROSS=yes; \ fi; \ @@ -208,8 +205,6 @@ index 64d2a40ad9f..6d3b75e22a2 100644 if { $comp_output != ""} { send_log "compilation of CTF program [concat $src] failed with <$comp_output>" - -base-commit: add96080cf9e460afe478cfad489d7f22ab10678 -- -2.48.1 +2.49.1
