diff -Nru binutils-2.39/debian/changelog binutils-2.39/debian/changelog --- binutils-2.39/debian/changelog 2022-09-24 12:22:36.000000000 +0000 +++ binutils-2.39/debian/changelog 2022-09-27 05:01:25.000000000 +0000 @@ -1,3 +1,27 @@ +binutils (2.39-3+rpi1) bookworm-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. + + -- Raspbian forward porter Tue, 27 Sep 2022 05:01:25 +0000 + binutils (2.39-3) unstable; urgency=medium * Ignore two failing tests on amd64, sh4 and x32, some more on hurd-i386. diff -Nru binutils-2.39/debian/control binutils-2.39/debian/control --- binutils-2.39/debian/control 2022-09-23 14:43:26.000000000 +0000 +++ binutils-2.39/debian/control 2022-09-27 05:01:25.000000000 +0000 @@ -7,22 +7,6 @@ Build-Depends: autoconf (>= 2.64), dpkg-dev (>= 1.19.0.5), bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16), python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, - g++-aarch64-linux-gnu [amd64 i386 x32] , - g++-arm-linux-gnueabi [amd64 arm64 i386 x32] , - g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] , - g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] , - g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] , - g++-alpha-linux-gnu [amd64 i386 x32] , - g++-hppa-linux-gnu [amd64 i386 x32] , - g++-m68k-linux-gnu [amd64 i386 x32] , - g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] , - g++-powerpc64-linux-gnu [amd64 i386 x32] , - g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] , - g++-sh4-linux-gnu [amd64 i386 x32] , - g++-sparc64-linux-gnu [amd64 i386 x32] , - g++-i686-linux-gnu [amd64 arm64 ppc64el x32] , - g++-x86-64-linux-gnu [arm64 i386 ppc64el] , - g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] , Build-Conflicts: libelf-dev Rules-Requires-Root: no Homepage: https://www.gnu.org/software/binutils/ @@ -57,7 +41,7 @@ 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}) Conflicts: modutils (<< 2.4.19-1), ${extraConflicts}, binutils-multiarch (<< 2.27-8) Provides: elf-binutils, ${gold:Provides} @@ -251,7 +235,7 @@ Package: binutils-x86-64-linux-gnu Priority: optional -Architecture: amd64 arm64 i386 ppc64el x32 +Architecture: amd64 arm64 i386 ppc64el x32 armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -269,7 +253,7 @@ Package: binutils-x86-64-linux-gnu-dbg Section: debug Priority: optional -Architecture: amd64 arm64 i386 ppc64el x32 +Architecture: amd64 arm64 i386 ppc64el x32 armhf Multi-Arch: foreign Depends: binutils-x86-64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for x86-64-linux-gnu target (debug symbols) @@ -277,7 +261,7 @@ Package: binutils-i686-linux-gnu Priority: optional -Architecture: i386 amd64 arm64 ppc64el x32 +Architecture: i386 amd64 arm64 ppc64el x32 armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -295,7 +279,7 @@ Package: binutils-i686-linux-gnu-dbg Section: debug Priority: optional -Architecture: i386 amd64 arm64 ppc64el x32 +Architecture: i386 amd64 arm64 ppc64el x32 armhf Multi-Arch: foreign Depends: binutils-i686-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for i686-linux-gnu target (debug symbols) @@ -303,7 +287,7 @@ Package: binutils-aarch64-linux-gnu Priority: optional -Architecture: arm64 amd64 i386 x32 ppc64el +Architecture: arm64 amd64 i386 x32 ppc64el armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -321,7 +305,7 @@ Package: binutils-aarch64-linux-gnu-dbg Section: debug Priority: optional -Architecture: arm64 amd64 i386 x32 ppc64el +Architecture: arm64 amd64 i386 x32 ppc64el armhf Multi-Arch: foreign Depends: binutils-aarch64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for aarch64-linux-gnu target (debug symbols) @@ -355,7 +339,7 @@ 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} @@ -373,7 +357,7 @@ Package: binutils-arm-linux-gnueabi-dbg Section: debug Priority: optional -Architecture: armel amd64 i386 x32 arm64 ppc64el +Architecture: armel amd64 i386 x32 arm64 ppc64el armhf Multi-Arch: foreign Depends: binutils-arm-linux-gnueabi (= ${binary:Version}) Description: GNU binary utilities, for arm-linux-gnueabi target (debug symbols) @@ -381,7 +365,7 @@ Package: binutils-powerpc64le-linux-gnu Priority: optional -Architecture: ppc64el amd64 i386 x32 ppc64 arm64 +Architecture: ppc64el Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -399,7 +383,7 @@ Package: binutils-powerpc64le-linux-gnu-dbg Section: debug Priority: optional -Architecture: ppc64el amd64 i386 x32 ppc64 arm64 +Architecture: ppc64el Multi-Arch: foreign Depends: binutils-powerpc64le-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc64le-linux-gnu target (debug symbols) @@ -407,7 +391,7 @@ 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} @@ -425,7 +409,7 @@ Package: binutils-s390x-linux-gnu-dbg Section: debug Priority: optional -Architecture: s390x amd64 i386 x32 arm64 ppc64el +Architecture: s390x Multi-Arch: foreign Depends: binutils-s390x-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for s390x-linux-gnu target (debug symbols) @@ -433,7 +417,7 @@ Package: binutils-alpha-linux-gnu Priority: optional -Architecture: alpha amd64 i386 x32 +Architecture: alpha Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -451,7 +435,7 @@ Package: binutils-alpha-linux-gnu-dbg Section: debug Priority: optional -Architecture: alpha amd64 i386 x32 +Architecture: alpha Multi-Arch: foreign Depends: binutils-alpha-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for alpha-linux-gnu target (debug symbols) @@ -459,7 +443,7 @@ Package: binutils-hppa-linux-gnu Priority: optional -Architecture: hppa amd64 i386 x32 +Architecture: hppa Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -477,7 +461,7 @@ Package: binutils-hppa-linux-gnu-dbg Section: debug Priority: optional -Architecture: hppa amd64 i386 x32 +Architecture: hppa Multi-Arch: foreign Depends: binutils-hppa-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for hppa-linux-gnu target (debug symbols) @@ -485,7 +469,7 @@ Package: binutils-ia64-linux-gnu Priority: optional -Architecture: ia64 amd64 i386 x32 +Architecture: ia64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -503,7 +487,7 @@ Package: binutils-ia64-linux-gnu-dbg Section: debug Priority: optional -Architecture: ia64 amd64 i386 x32 +Architecture: ia64 Multi-Arch: foreign Depends: binutils-ia64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for ia64-linux-gnu target (debug symbols) @@ -511,7 +495,7 @@ Package: binutils-m68k-linux-gnu Priority: optional -Architecture: m68k amd64 i386 x32 +Architecture: m68k Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -529,7 +513,7 @@ Package: binutils-m68k-linux-gnu-dbg Section: debug Priority: optional -Architecture: m68k amd64 i386 x32 +Architecture: m68k Multi-Arch: foreign Depends: binutils-m68k-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for m68k-linux-gnu target (debug symbols) @@ -537,7 +521,7 @@ Package: binutils-powerpc-linux-gnu Priority: optional -Architecture: powerpc amd64 i386 x32 ppc64el +Architecture: powerpc Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -555,7 +539,7 @@ Package: binutils-powerpc-linux-gnu-dbg Section: debug Priority: optional -Architecture: powerpc amd64 i386 x32 ppc64el +Architecture: powerpc Multi-Arch: foreign Depends: binutils-powerpc-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc-linux-gnu target (debug symbols) @@ -563,7 +547,7 @@ Package: binutils-powerpc64-linux-gnu Priority: optional -Architecture: ppc64 amd64 i386 x32 ppc64el +Architecture: ppc64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -581,7 +565,7 @@ Package: binutils-powerpc64-linux-gnu-dbg Section: debug Priority: optional -Architecture: ppc64 amd64 i386 x32 ppc64el +Architecture: ppc64 Multi-Arch: foreign Depends: binutils-powerpc64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for powerpc64-linux-gnu target (debug symbols) @@ -589,7 +573,7 @@ Package: binutils-riscv64-linux-gnu Priority: optional -Architecture: riscv64 amd64 i386 x32 arm64 ppc64el +Architecture: riscv64 amd64 i386 x32 arm64 ppc64el armhf Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -607,7 +591,7 @@ Package: binutils-riscv64-linux-gnu-dbg Section: debug Priority: optional -Architecture: riscv64 amd64 i386 x32 arm64 ppc64el +Architecture: riscv64 amd64 i386 x32 arm64 ppc64el armhf Multi-Arch: foreign Depends: binutils-riscv64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for riscv64-linux-gnu target (debug symbols) @@ -615,7 +599,7 @@ Package: binutils-sh4-linux-gnu Priority: optional -Architecture: sh4 amd64 i386 x32 +Architecture: sh4 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -633,7 +617,7 @@ Package: binutils-sh4-linux-gnu-dbg Section: debug Priority: optional -Architecture: sh4 amd64 i386 x32 +Architecture: sh4 Multi-Arch: foreign Depends: binutils-sh4-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for sh4-linux-gnu target (debug symbols) @@ -641,7 +625,7 @@ Package: binutils-sparc64-linux-gnu Priority: optional -Architecture: sparc64 amd64 i386 x32 +Architecture: sparc64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -659,7 +643,7 @@ Package: binutils-sparc64-linux-gnu-dbg Section: debug Priority: optional -Architecture: sparc64 amd64 i386 x32 +Architecture: sparc64 Multi-Arch: foreign Depends: binutils-sparc64-linux-gnu (= ${binary:Version}) Description: GNU binary utilities, for sparc64-linux-gnu target (debug symbols) @@ -667,7 +651,7 @@ 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} @@ -685,7 +669,7 @@ Package: binutils-x86-64-linux-gnux32-dbg Section: debug Priority: optional -Architecture: x32 amd64 arm64 i386 ppc64el +Architecture: x32 Multi-Arch: foreign Depends: binutils-x86-64-linux-gnux32 (= ${binary:Version}) Description: GNU binary utilities, for x86-64-linux-gnux32 target (debug symbols) @@ -693,7 +677,7 @@ 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} @@ -711,7 +695,7 @@ Package: binutils-i686-gnu-dbg Section: debug Priority: optional -Architecture: hurd-i386 amd64 i386 x32 +Architecture: hurd-i386 Multi-Arch: foreign Depends: binutils-i686-gnu (= ${binary:Version}) Description: GNU binary utilities, for i686-gnu target (debug symbols) @@ -719,7 +703,7 @@ Package: binutils-x86-64-kfreebsd-gnu Priority: optional -Architecture: kfreebsd-amd64 amd64 i386 x32 +Architecture: kfreebsd-amd64 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -737,7 +721,7 @@ Package: binutils-x86-64-kfreebsd-gnu-dbg Section: debug Priority: optional -Architecture: kfreebsd-amd64 amd64 i386 x32 +Architecture: kfreebsd-amd64 Multi-Arch: foreign Depends: binutils-x86-64-kfreebsd-gnu (= ${binary:Version}) Description: GNU binary utilities, for x86-64-kfreebsd-gnu target (debug symbols) @@ -745,7 +729,7 @@ Package: binutils-i686-kfreebsd-gnu Priority: optional -Architecture: kfreebsd-i386 amd64 i386 x32 +Architecture: kfreebsd-i386 Multi-Arch: allowed Depends: binutils-common (= ${binary:Version}), ${shlibs:Depends}, ${extraDepends} @@ -763,7 +747,7 @@ Package: binutils-i686-kfreebsd-gnu-dbg Section: debug Priority: optional -Architecture: kfreebsd-i386 amd64 i386 x32 +Architecture: kfreebsd-i386 Multi-Arch: foreign Depends: binutils-i686-kfreebsd-gnu (= ${binary:Version}) Description: GNU binary utilities, for i686-kfreebsd-gnu target (debug symbols) diff -Nru binutils-2.39/debian/control.in binutils-2.39/debian/control.in --- binutils-2.39/debian/control.in 2022-09-23 14:39:54.000000000 +0000 +++ binutils-2.39/debian/control.in 2022-09-27 05:01:25.000000000 +0000 @@ -7,22 +7,6 @@ Build-Depends: autoconf (>= 2.64), @dpkg_dev@ bison, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16), python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, - g++-aarch64-linux-gnu [amd64 i386 x32] , - g++-arm-linux-gnueabi [amd64 arm64 i386 x32] , - g++-arm-linux-gnueabihf [amd64 arm64 i386 x32] , - g++-powerpc64le-linux-gnu [amd64 arm64 i386 ppc64 x32] , - g++-s390x-linux-gnu [amd64 arm64 i386 ppc64el x32] , - g++-alpha-linux-gnu [amd64 i386 x32] , - g++-hppa-linux-gnu [amd64 i386 x32] , - g++-m68k-linux-gnu [amd64 i386 x32] , - g++-powerpc-linux-gnu [amd64 i386 ppc64el x32] , - g++-powerpc64-linux-gnu [amd64 i386 x32] , - g++-riscv64-linux-gnu [amd64 arm64 i386 ppc64el x32] , - g++-sh4-linux-gnu [amd64 i386 x32] , - g++-sparc64-linux-gnu [amd64 i386 x32] , - g++-i686-linux-gnu [amd64 arm64 ppc64el x32] , - g++-x86-64-linux-gnu [arm64 i386 ppc64el] , - g++-x86-64-linux-gnux32 [amd64 arm64 i386 ppc64el] , Build-Conflicts: libelf-dev Rules-Requires-Root: no Homepage: https://www.gnu.org/software/binutils/ @@ -57,7 +41,7 @@ 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}) Conflicts: modutils (<< 2.4.19-1), ${extraConflicts}, binutils-multiarch (<< 2.27-8) Provides: elf-binutils, ${gold:Provides} diff -Nru binutils-2.39/debian/patches/auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 binutils-2.39/debian/patches/auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 --- binutils-2.39/debian/patches/auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 1970-01-01 00:00:00.000000000 +0000 +++ binutils-2.39/debian/patches/auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 2022-09-27 05:01:25.000000000 +0000 @@ -0,0 +1,43 @@ +From: Raspbian forward porter +Subject: Automatically generated patch (2.38.50.20220707-1+rpi1) + +Last (up to) 3 git changes, FYI: + +commit 84d864a8c2aeed15bfe172bf90b18895b65054fa +Author: Raspbian automatic forward porter +Date: Wed Jul 13 19:12:07 2022 +0100 + + Defuzz fuzzy quilt patches and/or disable broken quilt patches + +commit 68e2891a3abdb0ff204c708b9439b4efbb329e82 +Merge: cc0baae1e 23d6ff538 +Author: Raspbian automatic forward porter +Date: Wed Jul 13 19:11:02 2022 +0100 + + Merge version 2.38-4+rpi1 and 2.38.50.20220707-1 to produce 2.38.50.20220707-1+rpi1 + +commit 23d6ff538cda3dd64832f5bc28320eb2051fbf02 +Merge: f9600eb1a c7659116f +Author: Matthias Klose +Date: Thu Jul 7 11:29:59 2022 +0100 + + Merge binutils (2.38.50.20220707-1) import into refs/heads/workingbranch +--- + +--- binutils-2.38.50.20220707.orig/bfd/elf32-arm.c ++++ binutils-2.38.50.20220707/bfd/elf32-arm.c +@@ -14543,14 +14543,6 @@ elf32_arm_merge_eabi_attributes (bfd *ib + if (out_attr[Tag_ABI_HardFP_use].i == 3 && out_attr[Tag_FP_arch].i == 0) + out_attr[Tag_ABI_HardFP_use].i = 0; + +- /* PR 28859 and 28848: Handle the case where the first input file, +- eg crti.o, has a Tag_ABI_HardFP_use of 3 but no Tag_FP_arch set. +- Using Tag_ABI_HardFP_use in this way is deprecated, so reset the +- attribute to zero. +- FIXME: Should we handle other non-zero values of Tag_ABI_HardFO_use ? */ +- if (out_attr[Tag_ABI_HardFP_use].i == 3 && out_attr[Tag_FP_arch].i == 0) +- out_attr[Tag_ABI_HardFP_use].i = 0; +- + return result; + } + diff -Nru binutils-2.39/debian/patches/fix-glibc-link-assertion.patch binutils-2.39/debian/patches/fix-glibc-link-assertion.patch --- binutils-2.39/debian/patches/fix-glibc-link-assertion.patch 1970-01-01 00:00:00.000000000 +0000 +++ binutils-2.39/debian/patches/fix-glibc-link-assertion.patch 2022-09-27 05:01:25.000000000 +0000 @@ -0,0 +1,19 @@ +Index: tempdefuzz/bfd/elf32-arm.c +=================================================================== +--- tempdefuzz.orig/bfd/elf32-arm.c ++++ tempdefuzz/bfd/elf32-arm.c +@@ -14543,6 +14543,14 @@ elf32_arm_merge_eabi_attributes (bfd *ib + if (out_attr[Tag_ABI_HardFP_use].i == 3 && out_attr[Tag_FP_arch].i == 0) + out_attr[Tag_ABI_HardFP_use].i = 0; + ++ /* PR 28859 and 28848: Handle the case where the first input file, ++ eg crti.o, has a Tag_ABI_HardFP_use of 3 but no Tag_FP_arch set. ++ Using Tag_ABI_HardFP_use in this way is deprecated, so reset the ++ attribute to zero. ++ FIXME: Should we handle other non-zero values of Tag_ABI_HardFO_use ? */ ++ if (out_attr[Tag_ABI_HardFP_use].i == 3 && out_attr[Tag_FP_arch].i == 0) ++ out_attr[Tag_ABI_HardFP_use].i = 0; ++ + return result; + } + diff -Nru binutils-2.39/debian/patches/series binutils-2.39/debian/patches/series --- binutils-2.39/debian/patches/series 2022-09-23 14:26:49.000000000 +0000 +++ binutils-2.39/debian/patches/series 2022-09-27 05:01:25.000000000 +0000 @@ -5,7 +5,6 @@ 003_gprof_see_also_monitor.patch 006_better_file_error.patch 013_bash_in_ld_testsuite.patch -#014_hash_style-both.patch 128_ppc64_powerpc_biarch.patch 129_multiarch_libpath.patch 130_gold_disable_testsuite_build.patch @@ -13,27 +12,14 @@ 135_bfd_soversion.patch 136_bfd_pic.patch 157_ar_scripts_with_tilde.patch -#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 -#pr-ld-16428.diff mips64-default-n64.diff gold-mips.diff gold-no-keep-files-mapped.diff - -# trunk backports - -# experimental ... -#infinity-notes.diff libctf-soname.diff - mips-hack.diff - -#aarch64-copy-reloc-revert-0.diff -#aarch64-copy-reloc-revert-1.diff -#aarch64-copy-reloc-revert-2.diff +fix-glibc-link-assertion.patch +auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 diff -Nru binutils-2.39/debian/rules binutils-2.39/debian/rules --- binutils-2.39/debian/rules 2022-09-24 10:21:41.000000000 +0000 +++ binutils-2.39/debian/rules 2022-09-27 05:01:25.000000000 +0000 @@ -144,7 +144,9 @@ ia64 riscv64 \ kfreebsd-amd64 kfreebsd-i386 hurd-i386 else ifeq ($(DEB_HOST_ARCH),arm64) - CROSS_ARCHS ?= amd64 armel armhf i386 ppc64el riscv64 s390x 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) @@ -190,15 +192,15 @@ endif HOST_ARCHS_armhf = amd64 i386 x32 arm64 ppc64el -HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el -HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el +HOST_ARCHS_armel = amd64 i386 x32 arm64 ppc64el armhf +HOST_ARCHS_arm64 = amd64 i386 x32 ppc64el armhf HOST_ARCHS_powerpc = amd64 i386 x32 ppc64el -HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 arm64 +HOST_ARCHS_ppc64el = amd64 i386 x32 ppc64 HOST_ARCHS_s390x = amd64 i386 x32 arm64 ppc64el -HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 -HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 +HOST_ARCHS_amd64 = arm64 i386 ppc64el x32 armhf +HOST_ARCHS_i386 = amd64 arm64 ppc64el x32 armhf HOST_ARCHS_ia64 = amd64 i386 x32 -HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el +HOST_ARCHS_riscv64 = amd64 i386 x32 arm64 ppc64el armhf HOST_ARCHS_alpha = amd64 i386 x32 #HOST_ARCHS_arc = amd64 i386 x32 @@ -207,14 +209,14 @@ HOST_ARCHS_ppc64 = amd64 i386 x32 ppc64el HOST_ARCHS_sh4 = amd64 i386 x32 HOST_ARCHS_sparc64 = amd64 i386 x32 -HOST_ARCHS_x32 = amd64 arm64 i386 ppc64el +HOST_ARCHS_x32 = amd64 i386 ppc64el HOST_ARCHS_mips = amd64 i386 x32 -HOST_ARCHS_mipsel = amd64 i386 x32 arm64 ppc64el +HOST_ARCHS_mipsel = amd64 i386 x32 ppc64el HOST_ARCHS_mipsn32 = amd64 i386 x32 HOST_ARCHS_mipsn32el = amd64 i386 x32 HOST_ARCHS_mips64 = amd64 i386 x32 -HOST_ARCHS_mips64el = amd64 i386 x32 arm64 ppc64el +HOST_ARCHS_mips64el = amd64 i386 x32 ppc64el HOST_ARCHS_mipsr6 = amd64 i386 x32 HOST_ARCHS_mipsr6el = amd64 i386 x32 @@ -553,7 +555,7 @@ CONFARGS_TARGET_arc = --with-cpu=hs38_linux -with_check := yes +with_check := disabled by plugwash ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) # override buildd admins to run the testsuite anyway ... ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpc sh4 sparc64))