From: Peter Michael Green Date: Mon, 30 Aug 2021 13:54:06 +0000 (+0000) Subject: Manual merge of version 2.35.2-2+rpi1 and 2.37-4 to produce 2.37-4+rpi1 X-Git-Tag: archive/raspbian/2.37-4+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c62c062f793a3b1af904deae5a14b38342bf364b;p=binutils.git Manual merge of version 2.35.2-2+rpi1 and 2.37-4 to produce 2.37-4+rpi1 --- 0c2af14ab477294d3420a0b6f32fc89183d0628b diff --cc debian/changelog index e43f80202,94665b283..4cf0b33e3 --- a/debian/changelog +++ b/debian/changelog @@@ -1,79 -1,162 +1,188 @@@ - binutils (2.35.2-2+rpi1) bullseye-staging; urgency=medium ++binutils (2.37-4+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. + - -- Raspbian forward porter Sat, 06 Mar 2021 18:46:07 +0000 ++ -- Raspbian forward porter Sat, 28 Aug 2021 20:11:42 +0000 + - binutils (2.35.2-2) unstable; urgency=medium + binutils (2.37-4) unstable; urgency=medium + * Update from the binutils 2.37 branch: + - Revert the ld script expression parsing changes. + + -- Matthias Klose Sun, 15 Aug 2021 16:51:18 +0200 + + binutils (2.37-2) experimental; urgency=medium + + * Update from the binutils 2.37 branch: + - Fix PR ld/28138, close the file descriptor if there is no archive fd. + - Fix PR 28144, man page generation. + - Fix ld script expression parsing. + - Fix build failures with clang. + - Revert: PowerPC: Don't generate unused section symbols, blindly + following x86 broken linux kernel builds. + + -- Matthias Klose Fri, 30 Jul 2021 13:49:51 +0200 + + binutils (2.37-1) experimental; urgency=medium + + * binutils 2.37 release. + + -- Matthias Klose Mon, 19 Jul 2021 08:11:10 +0200 + + binutils (2.36.90.20210712-1) UNRELEASED; urgency=medium + + * New upstream snapshot, taken from the 2.37 branch. + + -- Matthias Klose Mon, 12 Jul 2021 11:54:46 +0200 + + binutils (2.36.90.20210705-1) experimental; urgency=medium + + * New upstream snapshot, taken from the 2.37 branch. + + -- Matthias Klose Mon, 05 Jul 2021 09:17:21 +0200 + + binutils (2.36.50.20210628-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + + -- Matthias Klose Mon, 28 Jun 2021 16:14:58 +0200 + + binutils (2.36.50.20210618-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Apply a hack for mips. See #765710. + + -- Matthias Klose Fri, 18 Jun 2021 11:54:54 +0200 + + binutils (2.36.50.20210601-1) experimental; urgency=medium + + * New upstream snapshot, taken from the trunk. + * Refresh patches. + + -- Matthias Klose Tue, 01 Jun 2021 21:25:10 +0200 + + binutils (2.36.1-6) experimental; urgency=medium + + * Update from the binutils 2.36 branch: + - Add install dependencies for ld -> bfd and libctf -> bfd. + * Fix dangling symlinks in the cross packages. Closes: #985434. + * Ignore bootstrap test regressions on alpha and ia64. + + -- Matthias Klose Sat, 20 Mar 2021 15:59:45 +0100 + + binutils (2.36.1-5) experimental; urgency=medium + + * Update from the binutils 2.36 branch: + - PR ld/27441, inconsistency in weak definitions. + - PowerPC64 undefined weak visibility vs GOT optimisation. + + -- Matthias Klose Fri, 05 Mar 2021 20:59:07 +0100 + + binutils (2.36.1-4) experimental; urgency=medium + + * Update from the binutils 2.36 branch: + - binutils: Avoid renaming over existing files. + - PR 26945, PR 27456. + * When stripping packages, call debugedit before dwz to avoid warnings. + * Add a README.source file. + + -- Matthias Klose Fri, 26 Feb 2021 11:17:08 +0100 + + binutils (2.36.1-2) experimental; urgency=medium + + [ Matthias Klose ] + * Remove unused patch. + * Show available memory for autopkg tests. + * Fix libctf* symbols files, and dependency generation. Closes: #983220. * Add debugedit as dependency for the build autopkg test. - -- Matthias Klose Sat, 20 Feb 2021 16:38:30 +0100 - - binutils (2.35.2-1) unstable; urgency=medium - - * binutils 2.35.2 release. Closes: #982086. - - PR gas/27218, memory access violation in dwarf2dbg.c - - PR gas/27195, enable DWARF5 support when required - - PR binutils/27231: Fix parsing DWARF-5 line number tables, - DWARF-5: Ignore empty range in DWARF-5 line number tables - - Fix thinko in objcopy's memory freeing code (double free). - - Fix Segmentation fault i386-gen. - - PR binutils/26483, ASAN: ppc_elf_link_params elf32-ppc.c. - - PR binutils/26492, ASAN: ppc64_elf_before_check_relocs elf64-ppc.c. - - PR binutils/26489, ASAN: ppc64_elf_size_stubs elf64-ppc.c. - - power10 on ppc32 fix: - We don't support power10 on ppc32, mainly because some instructions - have 34-bit fields for which we don't have relocations on ppc32. - If you try to assemble typical code, you'll see errors saying - "reloc ... not supported by object file format". Also, on 32-bit - hosts with binutils configured without a 64-bit bfd, you'll see errors - saying "bignum invalid" when using large offsets. But let's not kill - output of prefix insns entirely on 32-bit hosts. - - R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA sanity check. - - POWER10: Add Return-Oriented Programming instructions. - - PR gold/27246, skip address size and segment selector for DWARF5. - - Fix PR ld/27259, stop ld from endless looping on SHF_LINK_ORDER sh_link - loops. - * Fix removal of gfdl files with invariant sections. - * Remove unused patch binutils-no-development. + [ Nicolas Boulenguez ] + * Various packaging changes. Closes: #979517. + - Fix details in clean Make target when TARGET architecture is specified. + - Fix a variable substition in debian/control. + - Refresh patches, sorting files in each patch. + - Compute D_CROSS from P_CROSS. + - Spare two subprocesses in control file generation. + - Replace Make foreach function with addprefix when possible. + - Remove apparently redundant test. + - Replace calls to dpkg-parsechangelog with /usr/share/dpkg/pkg-info.mk. + - Make flow of with_cross easyer to follow. + - Simplify definition of CROSS_ARCHS. + - Fix prerequisites of stamps/control. + - Fix an undefined reference when TARGET is defined. + - Wrap two calls to dpkg-architecture into the _gnu_type macro. + - Simplify a clean command. + - Drop two unused variable definitions. + - Distinguish TARGET, DEB_TARGET_ARCH and DEB_TARGET_GNU_TYPE. + - Improve the _gnu_type and _multiarch macros. + * README.cross: Document TARGET-driven cross build. Closes: #979516. + + -- Matthias Klose Sun, 21 Feb 2021 12:52:20 +0100 + + binutils (2.36.1-1) experimental; urgency=medium + + * binutils 2.36.1 release. + * Update from the binutils 2.36 branch: + - IBM Z: Implement instruction set extensions. + - PR27382, build failure if fileno() is a macro. + - ld: Remove x86 ISA level run-time tests. + * debian/patches/mips64-default-n64.diff: Update (YunQiang Su). + Patch never forwarded upstream. + * Build with Rules-Requires-Root: no. + * Bump standards version. * Set unique build-ids for stripped files. - * Regenerate man pages. - -- Matthias Klose Fri, 19 Feb 2021 17:55:20 +0100 + -- Matthias Klose Fri, 19 Feb 2021 14:52:51 +0100 - binutils (2.35.1-7) unstable; urgency=medium + binutils (2.36-2) experimental; urgency=medium - * Update from the binutils 2.35 branch: - - Fix PR gold/27140, ppc32 segmentation fault in make_stub. Closes: #973746. - - PR binutils/27128, nm -P portable output format regression. - - PR ld/26382, elf: Keep only one '@' for undefined versioned symbols. - - nm: Remove --with-symbol-versions. + * Snapshot, taken from the 2.36 branch (20210130). + + -- Matthias Klose Sat, 30 Jan 2021 16:04:47 +0100 + + binutils (2.36-1) experimental; urgency=medium + + * binutils 2.36 release. + * Update from the binutils 2.36 branch: + - DWARF-5: Ignore empty range in DWARF-5 line number tables. + + -- Matthias Klose Mon, 25 Jan 2021 11:43:44 +0100 + + binutils (2.35.90.20210120-1) experimental; urgency=medium + + * Snapshot, taken from the 2.36 branch (20210120). + + -- Matthias Klose Wed, 20 Jan 2021 10:45:39 +0100 + + binutils (2.35.90.20210113-1) experimental; urgency=medium - -- Matthias Klose Wed, 06 Jan 2021 11:57:25 +0100 + * Snapshot, taken from the 2.36 branch (20210113). - binutils (2.35.1-6) unstable; urgency=medium + -- Matthias Klose Wed, 13 Jan 2021 12:00:22 +0100 + binutils (2.35.50.20210106-1) experimental; urgency=medium + + * Snapshot, taken from the trunk (20210106). * Fix FTCBFS: Disable pgo for cross builds (Helmut Grohne). Closes: #977822. * 'nopgo' in DEB_BUILD_OPTIONS also disables the pgo builds. diff --cc debian/control index 3c1d397ff,c2b170426..5b5746f8c --- a/debian/control +++ b/debian/control @@@ -7,9 -7,26 +7,10 @@@ Standards-Version: 4.5. 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/ - Vcs-Browser: //salsa.debian.org/toolchain-team/binutils/tree/binutils-2.35 + Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils Vcs-Git: https://salsa.debian.org/toolchain-team/binutils.git XS-Testsuite: autopkgtest diff --cc debian/control.in index 1619117af,0fba3a77f..d13203404 --- a/debian/control.in +++ b/debian/control.in @@@ -7,9 -7,26 +7,10 @@@ Standards-Version: 4.5. 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/ - Vcs-Browser: //salsa.debian.org/toolchain-team/binutils/tree/binutils-2.35 + Vcs-Browser: https://salsa.debian.org/toolchain-team/binutils Vcs-Git: https://salsa.debian.org/toolchain-team/binutils.git XS-Testsuite: autopkgtest diff --cc debian/rules index 45558589d,548933e2b..55d51c50e --- a/debian/rules +++ b/debian/rules @@@ -116,66 -129,41 +129,43 @@@ ifneq ($(distribution)-$(CROSS_ARCHS),U NATIVE_ARCHS += mipsn32r6 mipsn32r6el mipsr6 mipsr6el mips64r6 mips64r6el endif - src_name := $(shell dpkg-parsechangelog -S Source) - ifeq ($(src_name),binutils) + with_cross = yes + ifeq ($(DEB_SOURCE),binutils) with_native = yes - with_cross = yes same_source = yes - ifeq (,$(CROSS_ARCHS)) - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32)) - CROSS_ARCHS = s390x ppc64el arm64 armhf armel - CROSS_ARCHS += alpha hppa m68k - CROSS_ARCHS += powerpc ppc64 sh4 sparc64 - CROSS_ARCHS += ia64 riscv64 - CROSS_ARCHS += kfreebsd-amd64 kfreebsd-i386 hurd-i386 - ifneq (,$(filter $(DEB_HOST_ARCH), i386 x32)) - CROSS_ARCHS += amd64 - endif - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 x32)) - CROSS_ARCHS += i386 - endif - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386)) - CROSS_ARCHS += x32 - endif - else ifeq ($(DEB_HOST_ARCH),arm64) - CROSS_ARCHS = armel armhf amd64 i386 riscv64 - else ifeq ($(DEB_HOST_ARCH),armhf) - CROSS_ARCHS = armel arm64 amd64 i386 riscv64 - else ifeq ($(DEB_HOST_ARCH),ppc64) - CROSS_ARCHS = ppc64el - else ifeq ($(DEB_HOST_ARCH),ppc64el) - CROSS_ARCHS = powerpc ppc64 amd64 i386 x32 arm64 armel armhf riscv64 s390x - else - CROSS_ARCHS = - endif - else - # c-t-b passes this one ... - CROSS_ARCHS := $(filter-out $(DEB_HOST_ARCH),$(CROSS_ARCHS)) + ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32)) + # DEB_HOST_ARCH is filtered-out later anyway, do not test here. + CROSS_ARCHS ?= amd64 i386 x32 \ + s390x ppc64el arm64 armhf armel \ + alpha hppa m68k \ + powerpc ppc64 sh4 sparc64 \ + 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 armhf i386 riscv64 + else ifeq ($(DEB_HOST_ARCH),ppc64) + CROSS_ARCHS ?= ppc64el + else ifeq ($(DEB_HOST_ARCH),ppc64el) + CROSS_ARCHS ?= powerpc ppc64 amd64 i386 x32 arm64 armel armhf riscv64 s390x endif - else ifeq ($(src_name),binutils-mipsen) + else ifeq ($(DEB_SOURCE),binutils-ports) + CROSS_ARCHS ?= m68k sh4 mips64 mips64el + else ifeq ($(DEB_SOURCE),binutils-mipsen) with_native = - with_cross = yes same_source = - ifeq (,$(CROSS_ARCHS)) - ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32 arm64 ppc64el)) - CROSS_ARCHS = mips mipsel mips64el mips64 mipsn32 mipsn32el - CROSS_ARCHS += mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el - else ifneq (,$(filter $(DEB_HOST_ARCH), arm64 ppc64el)) - CROSS_ARCHS = mipsel mips64el - else - CROSS_ARCHS = - endif - else - # c-t-b passes this one ... - CROSS_ARCHS := $(filter-out $(DEB_HOST_ARCH),$(CROSS_ARCHS)) + ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 x32 arm64 ppc64el)) + CROSS_ARCHS ?= mips mipsel mips64el mips64 mipsn32 mipsn32el \ + mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el + else ifneq (,$(filter $(DEB_HOST_ARCH), arm64 ppc64el)) + CROSS_ARCHS ?= mipsel mips64el endif else - # binutils-ports ... - with_cross = yes - ifeq (,$(CROSS_ARCHS)) - CROSS_ARCHS ?= m68k sh4 mips64 mips64el - endif + $(error unexpected source package name: $(DEB_SOURCE)) endif + # c-t-b passes this one ... + CROSS_ARCHS := $(filter-out $(DEB_HOST_ARCH),$(CROSS_ARCHS)) ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 x32 hppa)) with_hppa64 = yes @@@ -549,10 -534,10 +536,10 @@@ CONFARGS_TARGET_mips64r6el = --enable-t 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 sh4)) + ifeq (,$(filter $(DEB_HOST_ARCH), m68k powerpc sh4 sparc64)) with_check := disabled through DEB_BUILD_OPTIONS endif endif