On Sat, Jan 20, 2024 at 08:08:13PM -0500, Sasha Levin wrote: > This is a note to let you know that I've just added the patch titled > > powerpc: remove checks for binutils older than 2.25 > > to the 6.1-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > powerpc-remove-checks-for-binutils-older-than-2.25.patch > and it can be found in the queue-6.1 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > commit 71cbe64487ced1c21d177e6e478d6f8e473f9b45 > Author: Masahiro Yamada <masahiroy@xxxxxxxxxx> > Date: Thu Jan 19 17:22:50 2023 +0900 > > powerpc: remove checks for binutils older than 2.25 > > [ Upstream commit 54a11654de163994e32b24e3aa90ef81f4a3184d ] > > Commit e4412739472b ("Documentation: raise minimum supported version of > binutils to 2.25") allows us to remove the checks for old binutils. Commit e4412739472b landed in 6.2 and I don't see it backported, so this risks breaking users of binutils 2.23 to 2.25 in 6.1. While that risk is pretty low since I have not seen any complaints about raising that version in mainline and I doubt people are upgrading their kernel and not their toolchain, it could certainly happen... Not sure if you want to be proactive about it but I figured I would bring it up anyways. > There is no more user for ld-ifversion. Remove it as well. > > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> > Reviewed-by: Nicholas Piggin <npiggin@xxxxxxxxx> > Signed-off-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> > Link: https://msgid.link/20230119082250.151485-1-masahiroy@xxxxxxxxxx > Stable-dep-of: 1b1e38002648 ("powerpc: add crtsavres.o to always-y instead of extra-y") > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > > diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile > index 054844153b1f..487e4967b60d 100644 > --- a/arch/powerpc/Makefile > +++ b/arch/powerpc/Makefile > @@ -42,18 +42,13 @@ machine-$(CONFIG_PPC64) += 64 > machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le > UTS_MACHINE := $(subst $(space),,$(machine-y)) > > -# XXX This needs to be before we override LD below > -ifdef CONFIG_PPC32 > -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o > -else > -ifeq ($(call ld-ifversion, -ge, 22500, y),y) > +ifeq ($(CONFIG_PPC64)$(CONFIG_LD_IS_BFD),yy) > # Have the linker provide sfpr if possible. > # There is a corresponding test in arch/powerpc/lib/Makefile > KBUILD_LDFLAGS_MODULE += --save-restore-funcs > else > KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o > endif > -endif > > ifdef CONFIG_CPU_LITTLE_ENDIAN > KBUILD_CFLAGS += -mlittle-endian > @@ -391,17 +386,7 @@ endif > endif > > PHONY += checkbin > -# Check toolchain versions: > -# - gcc-4.6 is the minimum kernel-wide version so nothing required. > checkbin: > - @if test "x${CONFIG_LD_IS_LLD}" != "xy" -a \ > - "x$(call ld-ifversion, -le, 22400, y)" = "xy" ; then \ > - echo -n '*** binutils 2.24 miscompiles weak symbols ' ; \ > - echo 'in some circumstances.' ; \ > - echo '*** binutils 2.23 do not define the TOC symbol ' ; \ > - echo -n '*** Please use a different binutils version.' ; \ > - false ; \ > - fi > @if test "x${CONFIG_FTRACE_MCOUNT_USE_RECORDMCOUNT}" = "xy" -a \ > "x${CONFIG_LD_IS_BFD}" = "xy" -a \ > "${CONFIG_LD_VERSION}" = "23700" ; then \ > diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile > index 8560c912186d..b705c89f3e21 100644 > --- a/arch/powerpc/lib/Makefile > +++ b/arch/powerpc/lib/Makefile > @@ -42,7 +42,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o > # 64-bit linker creates .sfpr on demand for final link (vmlinux), > # so it is only needed for modules, and only for older linkers which > # do not support --save-restore-funcs > -ifeq ($(call ld-ifversion, -lt, 22500, y),y) > +ifndef CONFIG_LD_IS_BFD > extra-$(CONFIG_PPC64) += crtsavres.o > endif > > diff --git a/scripts/Makefile.compiler b/scripts/Makefile.compiler > index 158c57f2acfd..87589a7ba27f 100644 > --- a/scripts/Makefile.compiler > +++ b/scripts/Makefile.compiler > @@ -72,7 +72,3 @@ clang-min-version = $(shell [ $(CONFIG_CLANG_VERSION)0 -ge $(1)0 ] && echo y) > # ld-option > # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y) > ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3)) > - > -# ld-ifversion > -# Usage: $(call ld-ifversion, -ge, 22252, y) > -ld-ifversion = $(shell [ $(CONFIG_LD_VERSION)0 $(1) $(2)0 ] && echo $(3) || echo $(4))
