diff -Nru binutils-2.37/debian/changelog binutils-2.37/debian/changelog --- binutils-2.37/debian/changelog 2021-08-30 08:51:17.000000000 +0000 +++ binutils-2.37/debian/changelog 2021-09-02 14:37:32.000000000 +0000 @@ -1,3 +1,32 @@ +binutils (2.37-5+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 introduced in 2.35.1-5+rpi1 by Peter Michael Green] + * Touch gold/yyscript.h and gold/yyscript.c in clean target to ensure they are + newer than yyscript.y and hence stop the upstream build system trying to + regenerate them when building from a git checkout. + + [changes brought forward from 2.37-4+rpi2 by Peter Michael Green at Wed, 01 Sep 2021 12:43:37 +0000] + * Fix merge screwup that left us with no arm64 cross binutils. + + -- Raspbian forward porter Thu, 02 Sep 2021 14:37:32 +0000 + binutils (2.37-5) unstable; urgency=medium * Update from the binutils 2.37 branch: diff -Nru binutils-2.37/debian/control binutils-2.37/debian/control --- binutils-2.37/debian/control 2021-07-19 06:17:29.000000000 +0000 +++ binutils-2.37/debian/control 2021-09-02 14:37:32.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} @@ -226,7 +210,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} @@ -244,7 +228,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) @@ -252,7 +236,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} @@ -270,7 +254,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) @@ -278,7 +262,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} @@ -296,7 +280,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) @@ -330,7 +314,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} @@ -348,7 +332,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) @@ -356,7 +340,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} @@ -374,7 +358,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) @@ -382,7 +366,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} @@ -400,7 +384,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) @@ -408,7 +392,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} @@ -426,7 +410,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) @@ -434,7 +418,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} @@ -452,7 +436,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) @@ -460,7 +444,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} @@ -478,7 +462,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) @@ -486,7 +470,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} @@ -504,7 +488,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) @@ -512,7 +496,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} @@ -530,7 +514,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) @@ -538,7 +522,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} @@ -556,7 +540,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) @@ -564,7 +548,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} @@ -582,7 +566,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) @@ -590,7 +574,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} @@ -608,7 +592,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) @@ -616,7 +600,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} @@ -634,7 +618,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) @@ -642,7 +626,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} @@ -660,7 +644,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) @@ -668,7 +652,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} @@ -686,7 +670,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) @@ -694,7 +678,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} @@ -712,7 +696,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) @@ -720,7 +704,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} @@ -738,7 +722,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.37/debian/control.in binutils-2.37/debian/control.in --- binutils-2.37/debian/control.in 2021-02-20 16:35:23.000000000 +0000 +++ binutils-2.37/debian/control.in 2021-09-02 14:37:32.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.37/debian/rules binutils-2.37/debian/rules --- binutils-2.37/debian/rules 2021-08-30 08:40:47.000000000 +0000 +++ binutils-2.37/debian/rules 2021-09-02 14:37:32.000000000 +0000 @@ -142,7 +142,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) @@ -183,15 +185,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_hppa = amd64 i386 x32 @@ -199,14 +201,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 @@ -534,7 +536,7 @@ CONFARGS_TARGET_aarch64 = --enable-targets=aarch64_be-linux-gnu -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)) @@ -593,6 +595,11 @@ rm -f $${i%*.in}; \ done + #touch these files to ensure they are newer than yyscript.y + #and hence prevent the upstream buildsystem trying to regenerate + #them when building from a git checkout. + touch gold/yyscript.c gold/yyscript.h + rm -f *-stamp ###############################################################################