powerpc: remove checks for binutils older than 2.25
PATCH 1/1 powerpc: remove checks for binutils older than 2.25
Commit e4412739472b ("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.
There is no more user for ld-ifversion. Remove it as well.
---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)
arch/powerpc/Makefile +1 -21
@@ -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
@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all
@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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
arch/powerpc/lib/Makefile +1 -1
@@ -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
scripts/Makefile.compiler +0 -4
@@ -72,7 +72,3 @@ clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # 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))
Signature · 1 line
2.34.1
Quoted 5 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Quoted 87 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +1
-1@@ -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 endifscripts/Makefile.compiler +0
-5@@ -72,7 +72,3 @@ clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # 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)) --2.34.1
Quoted 6 lines · Joel Stanley
Quoted 4 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.
Quoted 7 lines
Quoted 1 line
There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
For LLD, CONFIG option is directly checked.
masahiro@zoe:~/ref/linux(master)$ git grep CONFIG_LLD_VERSION Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) arch/riscv/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) arch/x86/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) scripts/Kbuild.include:# Usage: $(call test-lt, $(CONFIG_LLD_VERSION), 150000)
Quoted 87 lines
Quoted 87 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +1
-1@@ -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 endifscripts/Makefile.compiler +0
-5@@ -72,7 +72,3 @@ clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # 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)) --2.34.1
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 8 lines · Masahiro Yamada
Quoted 6 lines · Joel Stanley
Quoted 4 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.
Quoted 9 lines
Quoted 7 lines
Quoted 1 line
There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Ping?
Quoted 113 lines
For LLD, CONFIG option is directly checked.
masahiro@zoe:~/ref/linux(master)$ git grep CONFIG_LLD_VERSION Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) arch/riscv/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) arch/x86/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) scripts/Kbuild.include:# Usage: $(call test-lt, $(CONFIG_LLD_VERSION), 150000)Quoted 72 lines
Quoted 72 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +1
-1@@ -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 endifQuoted 15 lines
Quoted 13 lines
scripts/Makefile.compiler +0
-5@@ -72,7 +72,3 @@ clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) # 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)) --Quoted 2 lines
2.34.1
--
Best Regards
Masahiro Yamada
Signature · 2 lines
Best Regards Masahiro Yamada
Nicholas Piggin
reviewerQuoted 13 lines · Masahiro Yamada
Quoted 12 lines · Masahiro Yamada
Quoted 10 lines · Joel Stanley
Quoted 5 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
Quoted 14 lines
Quoted 5 lines
Quoted 3 lines
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Ping?
Quoted 2 lines
For LLD, CONFIG option is directly checked.
Yeah, doesn't seem too difficult to add new linker version tests if needed.
Quoted 81 lines
Quoted 81 lines
masahiro@zoe:~/ref/linux(master)$ git grep CONFIG_LLD_VERSION Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) arch/riscv/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) arch/x86/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) scripts/Kbuild.include:# Usage: $(call test-lt, $(CONFIG_LLD_VERSION), 150000)Quoted 63 lines
Quoted 63 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +0
-0
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
arch/powerpc/lib/Makefile obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o · line 47
Quoted 8 lines
arch/powerpc/lib/Makefile +1
-1@@ -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
This test got inverted for LLD now AFAIKS?
Does LLVM support --save-restore-funcs and supply .sfpr already I wonder? We could remove this stuff entirely.
Thanks,
Nick
Quoted 115 lines · Nicholas Piggin
Quoted 13 lines · Masahiro Yamada
Quoted 12 lines · Masahiro Yamada
Quoted 10 lines · Joel Stanley
Quoted 5 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
Quoted 14 lines
Quoted 5 lines
Quoted 3 lines
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Ping?
Quoted 2 lines
For LLD, CONFIG option is directly checked.
Yeah, doesn't seem too difficult to add new linker version tests if needed.
Quoted 83 lines
Quoted 83 lines
masahiro@zoe:~/ref/linux(master)$ git grep CONFIG_LLD_VERSION Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) arch/riscv/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) arch/x86/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) scripts/Kbuild.include:# Usage: $(call test-lt, $(CONFIG_LLD_VERSION), 150000)Quoted 65 lines
Quoted 65 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +0
-0@@ -42,7 +42,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # 64-bit linker creates .sfpr on demand for final link (vmlinux),
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
arch/powerpc/lib/Makefile obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o · line 47
Quoted 6 lines
arch/powerpc/lib/Makefile +1
-1# 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 endifThis test got inverted for LLD now AFAIKS?
In my understanding,
For a BFD linker, use --save-restore-funcs.
Otherwise (i.e. CONFIG_LD_IS_BFD is unset), link crtsavres.o to modules.
I hope I did not change the logic.
Quoted 3 lines
Does LLVM support --save-restore-funcs and supply .sfpr already I wonder? We could remove this stuff entirely.
I don't know.
If LLVM 11.0.0 (the minimum supported LLVM version) supports --save-restore-funcs, you can remove this check entirely. Even so, it should be done in a follow-up patch.
This patch is just dropping dead code for BFD linker < 2.25, which is now unsupported. Nothing else has changed (I believe).
Signature · 2 lines
Best Regards Masahiro Yamada
Quoted 126 lines · Masahiro Yamada
Quoted 115 lines · Nicholas Piggin
Quoted 13 lines · Masahiro Yamada
Quoted 12 lines · Masahiro Yamada
Quoted 10 lines · Joel Stanley
Quoted 5 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
ppc kernels fail to link with 2.27 under some configurations:
Quoted 14 lines
Quoted 5 lines
Quoted 3 lines
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Ping?
Quoted 2 lines
For LLD, CONFIG option is directly checked.
Yeah, doesn't seem too difficult to add new linker version tests if needed.
Quoted 83 lines
Quoted 83 lines
masahiro@zoe:~/ref/linux(master)$ git grep CONFIG_LLD_VERSION Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) arch/riscv/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 150000),y) arch/x86/Makefile:ifeq ($(call test-lt, $(CONFIG_LLD_VERSION), 130000),y) scripts/Kbuild.include:# Usage: $(call test-lt, $(CONFIG_LLD_VERSION), 150000)Quoted 65 lines
Quoted 65 lines
Signed-off-by Masahiro Yamada <[email protected]>---
arch/powerpc/Makefile | 22 +--------------------- arch/powerpc/lib/Makefile | 2 +- scripts/Makefile.compiler | 4 ---- 3 files changed, 2 insertions(+), 26 deletions(-)arch/powerpc/Makefile +1
-21@@ -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@@ -389,8 +384,6 @@ vdso_prepare: prepare0 $(build)=arch/powerpc/kernel/vdso include/generated/vdso64-offsets.h) endif -archprepare: checkbin - archheaders: $(Q)$(MAKE) $(build)=arch/powerpc/kernel/syscalls all@@ -405,16 +398,3 @@ else $(eval KBUILD_CFLAGS += -mstack-protector-guard-offset=$(shell awk '{if ($$2 == "TASK_CANARY") print $$3;}' include/generated/asm-offsets.h)) 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 ; \ - fiarch/powerpc/lib/Makefile +0
-0@@ -42,7 +42,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # 64-bit linker creates .sfpr on demand for final link (vmlinux),Quoted 8 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
arch/powerpc/lib/Makefile obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o · line 47
Quoted 6 lines
arch/powerpc/lib/Makefile +1
-1# 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 endifThis test got inverted for LLD now AFAIKS?
Quoted 5 lines
In my understanding,
For a BFD linker, use --save-restore-funcs.
Otherwise (i.e.CONFIG_LD_IS_BFDis unset), link crtsavres.o to modules.I hope I did not change the logic.
I think I misread it, ignore me.
Quoted 4 lines
Quoted 4 lines
Quoted 8 lines
Quoted 2 lines
Does LLVM support --save-restore-funcs and supply .sfpr already I wonder? We could remove this stuff entirely.
I don't know.
If LLVM 11.0.0 (the minimum supported LLVM version) supports --save-restore-funcs, you can remove this check entirely. Even so, it should be done in a follow-up patch.
True. I don't have an lld < 14 to test, but 14 does accept the option and emits the functions if needed. But my clang 14 does not even generate calls to them so I assume earlier ones do not either. So we might be able to get rid of this stuff. I'll open an issue for it.
Quoted 2 lines
This patch is just dropping dead code for BFD linker < 2.25, which is now unsupported. Nothing else has changed (I believe).
Seems okay then.
Thanks,
Nick
Michael Ellerman
reviewerQuoted 11 lines · Masahiro Yamada
Quoted 10 lines · Masahiro Yamada
Quoted 8 lines · Joel Stanley
Quoted 5 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
ppc kernels fail to link with 2.27 under some configurations:
https://github.com/linuxppc/issues/issues/388
We may want to use ld-ifversion to exclude that version.
Ping?
Sorry. I've now applied the binutils 2.27 patch from Naveen, and this on top with minor tweaks to make it apply. The result is in my next branch.
https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?h=next
cheers
Michael Ellerman
AppliedQuoted 6 lines · Masahiro Yamada
Commit
e4412739472b("Documentation: raise minimum supported version of binutils to 2.25") allows us to remove the checks for old binutils.There is no more user for ld-ifversion. Remove it as well.
Applied to powerpc/next.
[1/1] powerpc: remove checks for binutils older than 2.25
https://git.kernel.org/powerpc/c/54a11654de163994e32b24e3aa90ef81f4a3184d
cheers