From: Peter Michael Green Date: Tue, 10 Jun 2025 14:28:19 +0000 (+0000) Subject: Manual merge of version 2.43.1-5+rpi1 and 2.44-3 to produce 2.44-3+rpi1 X-Git-Tag: archive/raspbian/2.44-3+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=138da43b2fafe6b527e2fc04a3a93b36dad8af49;p=binutils.git Manual merge of version 2.43.1-5+rpi1 and 2.44-3 to produce 2.44-3+rpi1 --- 138da43b2fafe6b527e2fc04a3a93b36dad8af49 diff --cc debian/changelog index 12da842c8,2abfa396f..de5041dfe --- a/debian/changelog +++ b/debian/changelog @@@ -1,30 -1,182 +1,210 @@@ - binutils (2.43.1-5+rpi1) trixie-staging; urgency=medium ++binutils (2.44-3+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 2.29-4+rpi1 by Peter Michael Green at Thu, 17 Aug 2017 15:41:49 +0000] + * Disable testsuite, it fails on our lxc based autobuilders. + + [changes brought forward from 2.31.1-16+rpi2 by Peter Michael Green at Thu, 06 Feb 2020 17:10:11 +0000] + * Allow dependency of binutils on binutils-triplet to be satisfied by + foreign architectures, to facilitate setting up environments where the + linker is 64-bit while everything else is 32-bit. + + [changes brought forward from 2.35-3+rpi2 by Peter Michael Green at Tue, 22 Sep 2020 18:10:17 +0000] + * Build sufficient cross binutils to support u-boot build. + + [changes brought forward from 2.35.1-3+rpi2 by Peter Michael Green at Tue, 01 Dec 2020 21:55:01 +0000] + * Build the same set of cross-binutils on arm64 as on armhf. + (avoids issues when control is generated on armhf and then package is + built on arm64) + * Remove build-depends as testsuite is disabled. + + [changes brought forward from 2.37.90.20220130-2+rpi2 by Peter Michael Green at Thu, 10 Feb 2022 12:05:47 +0000] + * Apply patch proposed upstream to fix glibc link issue. + + [changes brought forward from 2.40-2+rpi2 by Peter Michael Green at Tue, 23 May 2023 02:13:28 +0000] + * Non-maintainer upload. + * Use sed to adjust help2man output for multiarch consistency. + - -- Peter Michael Green Tue, 01 Oct 2024 06:00:41 +0000 ++ -- Peter Michael Green Tue, 10 Jun 2025 14:26:44 +0000 ++ + binutils (2.44-3) unstable; urgency=medium + + * New upstream snapshot, taken from the 2.44 release branch. + - Fix PR ld/32731, ub sanitizer accessing filenames_reversed. + - Translation updates. + * Don't configure --enable-warn-rwx-segments not enabled on hppa, sparc + and sparc64. Closes: #1098970. + * Fix cross build for gprofng archs (Helmut Grohne). Closes: #1098728. + + -- Matthias Klose Mon, 03 Mar 2025 22:01:22 +0100 + + binutils (2.44-2) unstable; urgency=medium + + * New upstream snapshot, taken from the 2.44 release branch. + - gas: fix rs_fill_nop listing. + - Fix score-elf gas SEGV. + * Configure with --disable-default-execstack --enable-warn-rwx-segments. + * Fix PR ld/32715, test failure with --disable-default-execstack. Taken + from the trunk. + + -- Matthias Klose Wed, 19 Feb 2025 07:58:28 +0100 + + binutils (2.44-1) unstable; urgency=medium + + * New upstream release. + * Drop build dependency on binutils-gold. + * Remove gold chunks from debian patches. + * Ignore testsuite regression on sh4. + + -- Matthias Klose Mon, 03 Feb 2025 06:36:41 +0100 + + binutils (2.43.90.20250202-1) unstable; urgency=medium + + * New upstream snapshot, taken from the 2.44 release branch. + * Update VCS attributes. + * Drop the binutils-gold dependency and make it a suggestion. + With the 2.44 release , gold is deprecated, and will be removed in + future binutils releases. Debian trixie will still ship with + the separate binutils-gold package. + + -- Matthias Klose Sun, 02 Feb 2025 13:10:32 +0100 + + binutils (2.43.90.20250127-1) unstable; urgency=medium + + * New upstream snapshot, taken from the 2.44 release branch.. + * Fix build failure on x32. + * Fix substitution of @gold_archs@ in targeted cross toolchains (Helmut + Grohne). Closes: #1093841. + * Fix PR 32599, taken from the trunk. Closes: #1093895. + + -- Matthias Klose Mon, 27 Jan 2025 11:12:03 +0100 + + binutils (2.43.90.20250122-2) unstable; urgency=medium + + * Fix binutils-gold dependencies. + + -- Matthias Klose Thu, 23 Jan 2025 03:37:28 +0100 + + binutils (2.43.90.20250122-1) unstable; urgency=medium + + * New upstream snapshot, taken from the 2.44 release branch.. + * Split out gold, as the gold source code removal is planned for the + final 2.44 release. For now, binutils depends on binutils-gold. + * Build-depend on binutils-gold where available. + * Refresh patches. + * binutils-doc: Make package more reproducible. Closes: #1092870. + * Move gprofng from binutils- into binutils, and introduce a + binutils-dbg package (Helmut Grohne). Closes: #1093594. + + -- Matthias Klose Wed, 22 Jan 2025 12:46:27 +0100 + + binutils (2.43.50.20250108-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Avoid warning in env-package-metadata.diff patch (Nicolas Boulenguez). + Closes: #1090761. + * binutils-doc: Make package reproducible. Closes: #1090395. + + -- Matthias Klose Thu, 09 Jan 2025 00:34:21 +0100 + + binutils (2.43.50.20241230-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Revert the fix for PR gas/32391. Closes: #1090999, #1091488. + * Build with GCC 14.2.0-12 on ARM32. Closes: #1091281. + + -- Matthias Klose Mon, 30 Dec 2024 12:18:11 +0100 + + binutils (2.43.50.20241221-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Drop the unused infinity-notes patch. + * gold: Support percent-encoded JSON in --package-metadata (proposed patch). + * Update libgprofng0 symbols file. + + -- Matthias Klose Sat, 21 Dec 2024 09:58:51 +0100 + + binutils (2.43.50.20241215-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Increase armhf section alignment to 64k (Ard Biesheuvel). Closes: #1089822. + + -- Matthias Klose Sun, 15 Dec 2024 11:00:07 +0100 + + binutils (2.43.50.20241210-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Refresh patches. + + -- Matthias Klose Tue, 10 Dec 2024 09:55:31 +0100 + + binutils (2.43.50.20241204-2) unstable; urgency=medium + + * Unset ELF_PACKAGE_METADATA when doing profiled builds and running tests. + + -- Matthias Klose Wed, 04 Dec 2024 14:17:25 +0100 + + binutils (2.43.50.20241204-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Disable the pgo build on armel and armhf for now. + + -- Matthias Klose Wed, 04 Dec 2024 10:13:16 +0100 + + binutils (2.43.50.20241126-3) unstable; urgency=medium + + * Don't install gprofng examples in multilib and cross packages. + Closes: #1088319. + + -- Matthias Klose Wed, 27 Nov 2024 10:18:02 +0100 + + binutils (2.43.50.20241126-2) unstable; urgency=medium + + * Work-around PR gprofng/32392. + + -- Matthias Klose Tue, 26 Nov 2024 16:40:54 +0100 + + binutils (2.43.50.20241126-1) unstable; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Configure again with --enable-default-hash-style=gnu on mips targets. + Closes: #1078819. + * Stop building gold on mips targets. + + -- Matthias Klose Tue, 26 Nov 2024 13:52:50 +0100 + + binutils (2.43.50.20241112-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Build packages for sparc-linux-gnu (Adrian Glaubitz). Closes: #1086027. + * Stop building packages for ia64-linux-gnu. Closes: #1086023. + + -- Matthias Klose Tue, 12 Nov 2024 17:37:05 +0100 + + binutils (2.43.50.20241004-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Make the jdk configury dependent on the pkg.binutils.nojava profile. + + -- Matthias Klose Fri, 04 Oct 2024 08:32:52 +0200 + + binutils (2.43.50.20240909-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + + -- Matthias Klose Mon, 09 Sep 2024 14:30:23 +0200 + + binutils (2.43.50.20240822-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Add default-jdk-headless to autopkg test dependencies. + + -- Matthias Klose Thu, 22 Aug 2024 17:21:00 +0200 + + binutils (2.43.50.20240817-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + + -- Matthias Klose Sat, 17 Aug 2024 10:50:59 +0200 binutils (2.43.1-5) unstable; urgency=medium diff --cc debian/control index f5d49c001,393929ea0..b08e0f2ca --- a/debian/control +++ b/debian/control @@@ -43,7 -60,8 +60,8 @@@ Description: GNU assembler, linker and Package: binutils Architecture: any Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}), - libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version}), + libbinutils (= ${binary:Version}), ${binutils:native}:any (= ${binary:Version}) + ${gold:Depends}, Conflicts: modutils (<< 2.4.19-1), ${extraConflicts}, binutils-multiarch (<< 2.27-8) Provides: elf-binutils, ${gold:Provides} @@@ -262,11 -299,11 +299,11 @@@ Description: Common files for the GNU a Package: binutils-x86-64-linux-gnu Priority: optional - Architecture: amd64 arm64 i386 ppc64el x32 armhf s390x -Architecture: amd64 arm64 i386 ppc64el x32 s390x ++Architecture: amd64 arm64 i386 ppc64el x32 s390x armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -281,7 -318,7 +318,7 @@@ Description: GNU binary utilities, for Package: binutils-x86-64-linux-gnu-dbg Section: debug Priority: optional - Architecture: amd64 arm64 i386 ppc64el x32 armhf s390x -Architecture: amd64 arm64 i386 ppc64el x32 s390x ++Architecture: amd64 arm64 i386 ppc64el x32 s390x armhf Multi-Arch: foreign Depends: binutils-x86-64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for x86-64-linux-gnu target (debug symbols) @@@ -289,11 -326,11 +326,11 @@@ Package: binutils-i686-linux-gnu Priority: optional - Architecture: i386 amd64 arm64 ppc64el x32 armhf s390x -Architecture: i386 amd64 arm64 ppc64el x32 s390x ++Architecture: i386 amd64 arm64 ppc64el x32 s390x armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: binutils-i686-linux-gnu Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -308,7 -345,7 +345,7 @@@ Description: GNU binary utilities, for Package: binutils-i686-linux-gnu-dbg Section: debug Priority: optional - Architecture: i386 amd64 arm64 ppc64el x32 armhf s390x -Architecture: i386 amd64 arm64 ppc64el x32 s390x ++Architecture: i386 amd64 arm64 ppc64el x32 s390x armhf Multi-Arch: foreign Depends: binutils-i686-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for i686-linux-gnu target (debug symbols) @@@ -316,11 -353,11 +353,11 @@@ Package: binutils-aarch64-linux-gnu Priority: optional - Architecture: arm64 amd64 i386 x32 ppc64el armhf s390x -Architecture: arm64 amd64 i386 x32 ppc64el s390x ++Architecture: arm64 amd64 i386 x32 ppc64el s390x armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -335,7 -372,7 +372,7 @@@ Description: GNU binary utilities, for Package: binutils-aarch64-linux-gnu-dbg Section: debug Priority: optional - Architecture: arm64 amd64 i386 x32 ppc64el armhf s390x -Architecture: arm64 amd64 i386 x32 ppc64el s390x ++Architecture: arm64 amd64 i386 x32 ppc64el s390x armhf Multi-Arch: foreign Depends: binutils-aarch64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for aarch64-linux-gnu target (debug symbols) @@@ -370,11 -407,11 +407,11 @@@ Description: GNU binary utilities, for Package: binutils-arm-linux-gnueabi Priority: optional -Architecture: armel amd64 i386 x32 arm64 ppc64el +Architecture: armel amd64 i386 x32 arm64 ppc64el armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -397,11 -434,11 +434,11 @@@ Description: GNU binary utilities, for Package: binutils-powerpc64le-linux-gnu Priority: optional - Architecture: ppc64el s390x -Architecture: ppc64el amd64 i386 x32 ppc64 arm64 s390x ++Architecture: ppc64el Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -416,7 -453,7 +453,7 @@@ Description: GNU binary utilities, for Package: binutils-powerpc64le-linux-gnu-dbg Section: debug Priority: optional - Architecture: ppc64el s390x -Architecture: ppc64el amd64 i386 x32 ppc64 arm64 s390x ++Architecture: ppc64el Multi-Arch: foreign Depends: binutils-powerpc64le-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbols) @@@ -424,11 -461,11 +461,11 @@@ Package: binutils-s390x-linux-gnu Priority: optional -Architecture: s390x amd64 i386 x32 arm64 ppc64el +Architecture: s390x Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -451,11 -488,11 +488,11 @@@ Description: GNU binary utilities, for Package: binutils-alpha-linux-gnu Priority: optional - Architecture: alpha arm64 ppc64el -Architecture: alpha amd64 i386 x32 arm64 ppc64el ++Architecture: alpha Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -470,7 -507,7 +507,7 @@@ Description: GNU binary utilities, for Package: binutils-alpha-linux-gnu-dbg Section: debug Priority: optional - Architecture: alpha arm64 ppc64el -Architecture: alpha amd64 i386 x32 arm64 ppc64el ++Architecture: alpha Multi-Arch: foreign Depends: binutils-alpha-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for alpha-linux-gnu target (debug symbols) @@@ -478,11 -515,11 +515,11 @@@ Package: binutils-arc-linux-gnu Priority: optional --Architecture: arc amd64 i386 x32 arm64 ppc64el ++Architecture: arc Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -497,7 -534,7 +534,7 @@@ Description: GNU binary utilities, for Package: binutils-arc-linux-gnu-dbg Section: debug Priority: optional --Architecture: arc amd64 i386 x32 arm64 ppc64el ++Architecture: arc Multi-Arch: foreign Depends: binutils-arc-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for arc-linux-gnu target (debug symbols) @@@ -505,11 -542,11 +542,11 @@@ Package: binutils-hppa-linux-gnu Priority: optional - Architecture: hppa arm64 ppc64el -Architecture: hppa amd64 i386 x32 arm64 ppc64el ++Architecture: hppa Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -524,46 -561,19 +561,19 @@@ Description: GNU binary utilities, for Package: binutils-hppa-linux-gnu-dbg Section: debug Priority: optional - Architecture: hppa arm64 ppc64el -Architecture: hppa amd64 i386 x32 arm64 ppc64el ++Architecture: hppa Multi-Arch: foreign Depends: binutils-hppa-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for hppa-linux-gnu target (debug symbols) This package provides debug symbols for binutils-hppa-linux-gnu. - Package: binutils-ia64-linux-gnu - Priority: optional - Architecture: ia64 - Multi-Arch: allowed - Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) - Provides: - Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) - Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) - Description: GNU binary utilities, for ia64-linux-gnu target - This package provides GNU assembler, linker and binary utilities - for the ia64-linux-gnu target. - . - You don't need this package unless you plan to cross-compile programs - for ia64-linux-gnu and ia64-linux-gnu is not your native - platform. - - Package: binutils-ia64-linux-gnu-dbg - Section: debug - Priority: optional - Architecture: ia64 - Multi-Arch: foreign - Depends: binutils-ia64-linux-gnu (= ${binary:Version}) - Description: GNU binary utilities, for ia64-linux-gnu target (debug symbols) - This package provides debug symbols for binutils-ia64-linux-gnu. - Package: binutils-loongarch64-linux-gnu Priority: optional --Architecture: loong64 amd64 i386 x32 arm64 ppc64el ++Architecture: loong64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -578,7 -588,7 +588,7 @@@ Description: GNU binary utilities, for Package: binutils-loongarch64-linux-gnu-dbg Section: debug Priority: optional --Architecture: loong64 amd64 i386 x32 arm64 ppc64el ++Architecture: loong64 Multi-Arch: foreign Depends: binutils-loongarch64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for loongarch64-linux-gnu target (debug symbols) @@@ -586,11 -596,11 +596,11 @@@ Package: binutils-m68k-linux-gnu Priority: optional - Architecture: m68k arm64 ppc64el -Architecture: m68k amd64 i386 x32 arm64 ppc64el ++Architecture: m68k Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -605,7 -615,7 +615,7 @@@ Description: GNU binary utilities, for Package: binutils-m68k-linux-gnu-dbg Section: debug Priority: optional - Architecture: m68k arm64 ppc64el -Architecture: m68k amd64 i386 x32 arm64 ppc64el ++Architecture: m68k Multi-Arch: foreign Depends: binutils-m68k-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for m68k-linux-gnu target (debug symbols) @@@ -613,11 -623,11 +623,11 @@@ Package: binutils-powerpc-linux-gnu Priority: optional - Architecture: powerpc arm64 s390x -Architecture: powerpc amd64 i386 x32 arm64 ppc64el s390x ++Architecture: powerpc Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -632,7 -642,7 +642,7 @@@ Description: GNU binary utilities, for Package: binutils-powerpc-linux-gnu-dbg Section: debug Priority: optional - Architecture: powerpc arm64 s390x -Architecture: powerpc amd64 i386 x32 arm64 ppc64el s390x ++Architecture: powerpc Multi-Arch: foreign Depends: binutils-powerpc-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc-linux-gnu target (debug symbols) @@@ -640,11 -650,11 +650,11 @@@ Package: binutils-powerpc64-linux-gnu Priority: optional - Architecture: ppc64 s390x -Architecture: ppc64 amd64 i386 x32 ppc64el s390x ++Architecture: ppc64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -659,7 -669,7 +669,7 @@@ Description: GNU binary utilities, for Package: binutils-powerpc64-linux-gnu-dbg Section: debug Priority: optional - Architecture: ppc64 s390x -Architecture: ppc64 amd64 i386 x32 ppc64el s390x ++Architecture: ppc64 Multi-Arch: foreign Depends: binutils-powerpc64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc64-linux-gnu target (debug symbols) @@@ -667,11 -677,11 +677,11 @@@ Package: binutils-riscv64-linux-gnu Priority: optional - Architecture: riscv64 amd64 i386 x32 arm64 ppc64el armhf s390x -Architecture: riscv64 amd64 i386 x32 arm64 ppc64el s390x ++Architecture: riscv64 amd64 i386 x32 arm64 ppc64el s390x armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -686,7 -696,7 +696,7 @@@ Description: GNU binary utilities, for Package: binutils-riscv64-linux-gnu-dbg Section: debug Priority: optional - Architecture: riscv64 amd64 i386 x32 arm64 ppc64el armhf s390x -Architecture: riscv64 amd64 i386 x32 arm64 ppc64el s390x ++Architecture: riscv64 amd64 i386 x32 arm64 ppc64el s390x armhf Multi-Arch: foreign Depends: binutils-riscv64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for riscv64-linux-gnu target (debug symbols) @@@ -694,11 -704,11 +704,11 @@@ Package: binutils-sh4-linux-gnu Priority: optional - Architecture: sh4 arm64 ppc64el -Architecture: sh4 amd64 i386 x32 arm64 ppc64el ++Architecture: sh4 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -713,19 -723,46 +723,46 @@@ Description: GNU binary utilities, for Package: binutils-sh4-linux-gnu-dbg Section: debug Priority: optional - Architecture: sh4 arm64 ppc64el -Architecture: sh4 amd64 i386 x32 arm64 ppc64el ++Architecture: sh4 Multi-Arch: foreign Depends: binutils-sh4-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for sh4-linux-gnu target (debug symbols) This package provides debug symbols for binutils-sh4-linux-gnu. + Package: binutils-sparc-linux-gnu + Priority: optional -Architecture: sparc amd64 i386 x32 arm64 ppc64el ++Architecture: sparc + Multi-Arch: allowed + Depends: binutils-common (= ${binary:Version}), + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, + Provides: + Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) + Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) + Description: GNU binary utilities, for sparc-linux-gnu target + This package provides GNU assembler, linker and binary utilities + for the sparc-linux-gnu target. + . + You don't need this package unless you plan to cross-compile programs + for sparc-linux-gnu and sparc-linux-gnu is not your native + platform. + + Package: binutils-sparc-linux-gnu-dbg + Section: debug + Priority: optional -Architecture: sparc amd64 i386 x32 arm64 ppc64el ++Architecture: sparc + Multi-Arch: foreign + Depends: binutils-sparc-linux-gnu (= ${binary:Version}) + Description: GNU binary utilities, for sparc-linux-gnu target (debug symbols) + This package provides debug symbols for binutils-sparc-linux-gnu. + Package: binutils-sparc64-linux-gnu Priority: optional - Architecture: sparc64 arm64 ppc64el -Architecture: sparc64 amd64 i386 x32 arm64 ppc64el ++Architecture: sparc64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -740,7 -777,7 +777,7 @@@ Description: GNU binary utilities, for Package: binutils-sparc64-linux-gnu-dbg Section: debug Priority: optional - Architecture: sparc64 arm64 ppc64el -Architecture: sparc64 amd64 i386 x32 arm64 ppc64el ++Architecture: sparc64 Multi-Arch: foreign Depends: binutils-sparc64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for sparc64-linux-gnu target (debug symbols) @@@ -748,11 -785,11 +785,11 @@@ Package: binutils-x86-64-linux-gnux32 Priority: optional -Architecture: x32 amd64 arm64 i386 ppc64el +Architecture: x32 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -775,11 -812,11 +812,11 @@@ Description: GNU binary utilities, for Package: binutils-x86-64-gnu Priority: optional --Architecture: hurd-amd64 amd64 i386 x32 ++Architecture: hurd-amd64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) @@@ -794,7 -831,7 +831,7 @@@ Description: GNU binary utilities, for Package: binutils-x86-64-gnu-dbg Section: debug Priority: optional --Architecture: hurd-amd64 amd64 i386 x32 ++Architecture: hurd-amd64 Multi-Arch: foreign Depends: binutils-x86-64-gnu (= ${binary:Version}) Description: GNU binary utilities, for x86-64-gnu target (debug symbols) @@@ -802,11 -839,11 +839,11 @@@ Package: binutils-i686-gnu Priority: optional -Architecture: hurd-i386 amd64 i386 x32 +Architecture: hurd-i386 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), - ${shlibs:Depends}, ${extraDepends} - Suggests: binutils-doc (= ${source:Version}) + ${shlibs:Depends}, ${extraDepends}, ${goldnat:Depends}, + Suggests: binutils-doc (= ${source:Version}), ${goldnat:Suggests}, Provides: binutils-i686-gnu Breaks: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) Replaces: binutils (<< 2.29-6), binutils-dev (<< 2.38.50.20220609-2) diff --cc debian/control.in index adb289712,58ef8476c..71a5b9653 --- a/debian/control.in +++ b/debian/control.in @@@ -43,7 -60,8 +60,8 @@@ Description: GNU assembler, linker and Package: binutils Architecture: any Depends: ${shlibs:Depends}, binutils-common (= ${binary:Version}), - libbinutils (= ${binary:Version}), ${binutils:native} (= ${binary:Version}), + libbinutils (= ${binary:Version}), ${binutils:native}:any (= ${binary:Version}) + ${gold:Depends}, Conflicts: modutils (<< 2.4.19-1), ${extraConflicts}, binutils-multiarch (<< 2.27-8) Provides: elf-binutils, ${gold:Provides} diff --cc debian/patches/series index 08b1c516e,c09c930d3..5354b90c1 --- a/debian/patches/series +++ b/debian/patches/series @@@ -12,15 -12,32 +12,22 @@@ branch-version.dif 135_bfd_soversion.patch 136_bfd_pic.patch 157_ar_scripts_with_tilde.patch - 161_gold_dummy_zoption.diff -#158_ld_system_root.patch + #161_gold_dummy_zoption.diff + -# only applied for GFDL builds 164_ld_doc_remove_xref.diff - gprof-build.diff aarch64-libpath.diff - gold-no-keep-files-mapped.diff - -#pr-ld-16428.diff + #gold-no-keep-files-mapped.diff - -# trunk backports - libctf-soname.diff - mips-hack.diff - perl-shebang.diff env-package-metadata.diff + pr32392-workaround.diff - + # https://sourceware.org/bugzilla/show_bug.cgi?id=30033 + armhf-64k-alignment.diff - + #gold-package-metadata.diff - + gprofng-examples-tgz-deterministic.diff + pr32715.diff + gprofng-cross-build.diff +fix-glibc-link-assertion.patch +auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 diff --cc debian/rules index 4921f004d,ecd3a5c32..ee8406f8a --- a/debian/rules +++ b/debian/rules @@@ -125,13 -125,12 +125,13 @@@ ifeq ($(DEB_SOURCE),binutils CROSS_ARCHS ?= amd64 i386 x32 \ s390x ppc64el arm64 armhf armel \ alpha arc hppa loong64 m68k \ - powerpc ppc64 sh4 sparc64 \ - ia64 riscv64 \ + powerpc ppc64 sh4 sparc sparc64 \ + riscv64 \ hurd-amd64 hurd-i386 else ifeq ($(DEB_HOST_ARCH),arm64) - CROSS_ARCHS ?= amd64 armel armhf i386 powerpc ppc64el riscv64 s390x \ - alpha arc hppa loong64 m68k sh4 sparc sparc64 x32 + CROSS_ARCHS ?= amd64 armel armhf i386 riscv64 + else ifeq ($(DEB_HOST_ARCH),armhf) + CROSS_ARCHS ?= amd64 armel arm64 i386 riscv64 else ifeq ($(DEB_HOST_ARCH),ppc64) CROSS_ARCHS ?= ppc64el else ifeq ($(DEB_HOST_ARCH),ppc64el)