From: Peter Michael Green Date: Wed, 5 Oct 2022 00:36:28 +0000 (+0000) Subject: Manual merge of version 2.39-3+rpi1 and 2.39-6 to produce 2.39-6+rpi1 X-Git-Tag: raspbian/2.39-6+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9900c1c1f3c30556cf8b0061a184672ebb3e7c63;p=binutils.git Manual merge of version 2.39-3+rpi1 and 2.39-6 to produce 2.39-6+rpi1 --- d2b437d28dbc6c0716f7dba228a15718da20d296 diff --cc debian/changelog index dfdfc9ddc,dc675c603..96b4398a9 --- a/debian/changelog +++ b/debian/changelog @@@ -1,26 -1,24 +1,48 @@@ - binutils (2.39-3+rpi1) bookworm-staging; urgency=medium ++binutils (2.39-6+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 ++ -- Peter Michael Green Wed, 05 Oct 2022 00:35:00 +0000 ++ + binutils (2.39-6) unstable; urgency=medium + + * Fix arch-only build. + + -- Matthias Klose Fri, 30 Sep 2022 13:34:10 +0200 + + binutils (2.39-5) unstable; urgency=medium + + * Only install /etc/gprofng.rc when available. + * Don't ship a symbols file for libgprofng0. + + -- Matthias Klose Fri, 30 Sep 2022 10:10:39 +0200 + + binutils (2.39-4) unstable; urgency=medium + + * Update from the binutils 2.39 branch: + - Fix PR gold/29542, PowerPC gold internal error. + * Build packages for arc-linux-gnu. Closes: #1002705. + * Fix some lintian errors and warnings. + + -- Matthias Klose Wed, 28 Sep 2022 13:35:26 +0200 binutils (2.39-3) unstable; urgency=medium diff --cc debian/control index 7250cc734,f4df939fb..6df55b5a7 --- a/debian/control +++ b/debian/control @@@ -6,7 -6,23 +6,7 @@@ Uploaders: James Troup = 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, + python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, help2man, - 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/ @@@ -441,9 -457,35 +441,35 @@@ Depends: binutils-alpha-linux-gnu (= ${ Description: GNU binary utilities, for alpha-linux-gnu target (debug symbols) This package provides debug symbols for binutils-alpha-linux-gnu. + Package: binutils-arc-linux-gnu + Priority: optional + Architecture: arc amd64 i386 x32 arm64 + 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 arc-linux-gnu target + This package provides GNU assembler, linker and binary utilities + for the arc-linux-gnu target. + . + You don't need this package unless you plan to cross-compile programs + for arc-linux-gnu and arc-linux-gnu is not your native platform. + + Package: binutils-arc-linux-gnu-dbg + Section: debug + Priority: optional + Architecture: arc amd64 i386 x32 arm64 + Multi-Arch: foreign + Depends: binutils-arc-linux-gnu (= ${binary:Version}) + Description: GNU binary utilities, for arc-linux-gnu target (debug symbols) + This package provides debug symbols for binutils-arc-linux-gnu. + 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} diff --cc debian/control.in index 604bed541,8afec3660..71e4cbd4c --- a/debian/control.in +++ b/debian/control.in @@@ -5,8 -5,24 +5,8 @@@ Maintainer: Matthias Klose Standards-Version: 4.6.1 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, - python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, help2man, - 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] , ++ bison,, flex, gettext, texinfo, dejagnu, quilt, chrpath, dwz, debugedit (>= 4.16), ++ python3:any, file, xz-utils, lsb-release, zlib1g-dev, procps, help2man Build-Conflicts: libelf-dev Rules-Requires-Root: no Homepage: https://www.gnu.org/software/binutils/ diff --cc debian/patches/series index 83f9b4954,649519a1e..e8df7cc30 --- a/debian/patches/series +++ b/debian/patches/series @@@ -19,7 -24,18 +19,8 @@@ aarch64-libpath.dif 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 - + perl-shebang.diff +fix-glibc-link-assertion.patch +auto-2.38.50.20220707-1+rpi1-84d864a8c2aeed15bfe172bf90b18895b65054fa-1657735965 diff --cc debian/rules index 9dc3d4c74,bfdcb258c..27a772a4b --- a/debian/rules +++ b/debian/rules @@@ -191,16 -189,17 +191,17 @@@ ifneq (,$(filter $(DEB_HOST_ARCH),amd6 CONF_GPROFNG = --enable-gprofng endif + HOST_ARCHS_arc = amd64 i386 x32 arm64 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