Skip to contentSkip to conversation

powerpc: clean up binutils version check

PATCH In review Masahiro Yamada 4 participants 7 messages Aug 27, 2022 – Aug 30, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: clean up binutils version check

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

PPC is the last user of ld-ifversion. With all the callers removed, the macro definition in scripts/Makefile.compiler can go away.

---

 arch/powerpc/Makefile       | 21 ---------------------
 arch/powerpc/lib/Makefile   |  8 --------
 scripts/Makefile.compiler   |  4 ----
 scripts/min-tool-version.sh |  8 +++++++-
 4 files changed, 7 insertions(+), 34 deletions(-)
arch/powerpc/Makefile +0 -21
index 02742facf895..fb607758eeca 100644
@@ -46,13 +46,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y))
 ifdef CONFIG_PPC32
 KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
 else
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
-# 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
@@ -395,8 +389,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
 
@@ -411,16 +403,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 +0 -8
index 8560c912186d..5eb3971ccb9c 100644
@@ -38,14 +38,6 @@ obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
 
 obj-$(CONFIG_FUNCTION_ERROR_INJECTION)	+= error-inject.o
 
-# See corresponding test in arch/powerpc/Makefile
-# 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)
-extra-$(CONFIG_PPC64)	+= crtsavres.o
-endif
-
 obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
 			       memcpy_power7.o restart_table.o
 
scripts/Makefile.compiler +0 -4
index 94d0d40cddb3..63e7d79dd877 100644
@@ -68,7 +68,3 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e
 # 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))
scripts/min-tool-version.sh +7 -1
index 250925aab101..7df9f2150ea1 100755
@@ -14,7 +14,13 @@ fi
 
 case "$1" in
 binutils)
-	echo 2.23.0
+	if [ "$SRCARCH" = powerpc ]; then
+		# binutils 2.24 miscompiles weak symbols in some circumstances
+		# binutils 2.23 do not define the TOC symbol
+		echo 2.25.0
+	else
+		echo 2.23.0
+	fi
 	;;
 gcc)
 	echo 5.1.0
Signature · 1 line
2.34.1
#1 lore raw

Le 27/08/2022 à 18:40, Masahiro Yamada a écrit :

Quoted 101 lines

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

PPC is the last user of ld-ifversion. With all the callers removed, the macro definition in scripts/Makefile.compiler can go away.

---

  arch/powerpc/Makefile       | 21 ---------------------
  arch/powerpc/lib/Makefile   |  8 --------
  scripts/Makefile.compiler   |  4 ----
  scripts/min-tool-version.sh |  8 +++++++-
  4 files changed, 7 insertions(+), 34 deletions(-)
arch/powerpc/Makefile +0 -21
index 02742facf895..fb607758eeca 100644
@@ -46,13 +46,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y))
  ifdef CONFIG_PPC32
  KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  else
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
-# 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
@@ -395,8 +389,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
 
@@ -411,16 +403,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 +0 -8
index 8560c912186d..5eb3971ccb9c 100644
@@ -38,14 +38,6 @@ obj-$(CONFIG_PPC32)	+= div64.o copy_32.o crtsavres.o
 
  obj-$(CONFIG_FUNCTION_ERROR_INJECTION)	+= error-inject.o
 
-# See corresponding test in arch/powerpc/Makefile
-# 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)
-extra-$(CONFIG_PPC64)	+= crtsavres.o
-endif
-
  obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
  			       memcpy_power7.o restart_table.o
 
scripts/Makefile.compiler +0 -4
index 94d0d40cddb3..63e7d79dd877 100644
@@ -68,7 +68,3 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e
  # 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))
scripts/min-tool-version.sh +0 -0
index 250925aab101..7df9f2150ea1 100755

scripts/min-tool-version.sh fi · line 17

Quoted 5 lines
scripts/min-tool-version.sh +1 -1
@@ -14,7 +14,13 @@ fi
 
  case "$1" in
  binutils)
-	echo 2.23.0
+	if [ "$SRCARCH" = powerpc ]; then

Isn't this limitation only for ppc64le ?

Refer commit 60e065f70bdb ("powerpc: Reject binutils 2.24 when building little endian")

Quoted 9 lines
scripts/min-tool-version.sh +6 -0
+		# binutils 2.24 miscompiles weak symbols in some circumstances
+		# binutils 2.23 do not define the TOC symbol
+		echo 2.25.0
+	else
+		echo 2.23.0
+	fi
  	;;
  gcc)
  	echo 5.1.0
#2 lore raw
Quoted 113 lines · Christophe Leroy
Quoted 101 lines · Masahiro Yamada

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

PPC is the last user of ld-ifversion. With all the callers removed, the macro definition in scripts/Makefile.compiler can go away.

---

  arch/powerpc/Makefile       | 21 ---------------------
  arch/powerpc/lib/Makefile   |  8 --------
  scripts/Makefile.compiler   |  4 ----
  scripts/min-tool-version.sh |  8 +++++++-
  4 files changed, 7 insertions(+), 34 deletions(-)
arch/powerpc/Makefile +0 -21
index 02742facf895..fb607758eeca 100644
@@ -46,13 +46,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y))
  ifdef CONFIG_PPC32
  KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
  else
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
-# 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
@@ -395,8 +389,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
 
@@ -411,16 +403,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 +0 -8
index 8560c912186d..5eb3971ccb9c 100644
@@ -38,14 +38,6 @@ obj-$(CONFIG_PPC32)        += div64.o copy_32.o crtsavres.o
 
  obj-$(CONFIG_FUNCTION_ERROR_INJECTION)      += error-inject.o
 
-# See corresponding test in arch/powerpc/Makefile
-# 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)
-extra-$(CONFIG_PPC64)        += crtsavres.o
-endif
-
  obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
                             memcpy_power7.o restart_table.o
 
scripts/Makefile.compiler +0 -4
index 94d0d40cddb3..63e7d79dd877 100644
@@ -68,7 +68,3 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e
  # 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))
scripts/min-tool-version.sh +0 -0
index 250925aab101..7df9f2150ea1 100755

scripts/min-tool-version.sh fi · line 17

Quoted 5 lines
scripts/min-tool-version.sh +1 -1
@@ -14,7 +14,13 @@ fi
 
  case "$1" in
  binutils)
-     echo 2.23.0
+     if [ "$SRCARCH" = powerpc ]; then

Isn't this limitation only for ppc64le ?

Quoted 2 lines

Refer commit 60e065f70bdb ("powerpc: Reject binutils 2.24 when building little endian")

I do not see any CONFIG check in the current checkbin.

Refer commit a3ad84da0760 ("powerpc/toc: Future proof kernel toc")

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw

Le 27/08/2022 à 20:03, Masahiro Yamada a écrit :

Quoted 115 lines
Quoted 113 lines · Christophe Leroy
Quoted 101 lines · Masahiro Yamada

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

PPC is the last user of ld-ifversion. With all the callers removed, the macro definition in scripts/Makefile.compiler can go away.

---

   arch/powerpc/Makefile       | 21 ---------------------
   arch/powerpc/lib/Makefile   |  8 --------
   scripts/Makefile.compiler   |  4 ----
   scripts/min-tool-version.sh |  8 +++++++-
   4 files changed, 7 insertions(+), 34 deletions(-)
arch/powerpc/Makefile +0 -21
index 02742facf895..fb607758eeca 100644
@@ -46,13 +46,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y))
   ifdef CONFIG_PPC32
   KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
   else
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
-# 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
@@ -395,8 +389,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
 
@@ -411,16 +403,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 +0 -8
index 8560c912186d..5eb3971ccb9c 100644
@@ -38,14 +38,6 @@ obj-$(CONFIG_PPC32)        += div64.o copy_32.o crtsavres.o
 
   obj-$(CONFIG_FUNCTION_ERROR_INJECTION)      += error-inject.o
 
-# See corresponding test in arch/powerpc/Makefile
-# 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)
-extra-$(CONFIG_PPC64)        += crtsavres.o
-endif
-
   obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
                              memcpy_power7.o restart_table.o
 
scripts/Makefile.compiler +0 -4
index 94d0d40cddb3..63e7d79dd877 100644
@@ -68,7 +68,3 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e
   # 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))
scripts/min-tool-version.sh +0 -0
index 250925aab101..7df9f2150ea1 100755

scripts/min-tool-version.sh fi · line 17

Quoted 5 lines
scripts/min-tool-version.sh +1 -1
@@ -14,7 +14,13 @@ fi
 
   case "$1" in
   binutils)
-     echo 2.23.0
+     if [ "$SRCARCH" = powerpc ]; then

Isn't this limitation only for ppc64le ?

Quoted 9 lines
Quoted 2 lines

Refer commit 60e065f70bdb ("powerpc: Reject binutils 2.24 when building little endian")

I do not see any CONFIG check in the current checkbin.

Refer commit a3ad84da0760 ("powerpc/toc: Future proof kernel toc")

That's odd. There is no toc on PPC32.

Christophe

#4 lore raw
Quoted 12 lines · Christophe Leroy

Le 27/08/2022 à 20:03, Masahiro Yamada a écrit :

Quoted 11 lines
Quoted 9 lines · Christophe Leroy
Quoted 8 lines · Masahiro Yamada

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

...

Quoted 16 lines
Quoted 16 lines
Quoted 15 lines

scripts/min-tool-version.sh fi · line 17

Quoted 10 lines
scripts/min-tool-version.sh +1 -1
index 250925aab101..7df9f2150ea1 100755
@@ -14,7 +14,13 @@ fi
 
   case "$1" in
   binutils)
-     echo 2.23.0
+     if [ "$SRCARCH" = powerpc ]; then

Isn't this limitation only for ppc64le ?

Refer commit 60e065f70bdb ("powerpc: Reject binutils 2.24 when building little endian")

Quoted 6 lines
Quoted 4 lines

I do not see any CONFIG check in the current checkbin.

Refer commit a3ad84da0760 ("powerpc/toc: Future proof kernel toc")

That's odd. There is no toc on PPC32.

I think that's just a bug in a3ad84da0760.

But that means we inadvertantly dropped support for 2.24 about 8 months ago, and no one noticed.

Let's see what the responses are to Nick's proposal to increase the minimum to 2.25.1.

cheers

#5 lore raw
Quoted 40 lines · Michael Ellerman
Quoted 12 lines · Christophe Leroy
Quoted 11 lines · Masahiro Yamada
Quoted 9 lines · Christophe Leroy
Quoted 8 lines · Masahiro Yamada

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

...

Quoted 16 lines
Quoted 16 lines
Quoted 15 lines

scripts/min-tool-version.sh fi · line 17

Quoted 10 lines
scripts/min-tool-version.sh +1 -1
index 250925aab101..7df9f2150ea1 100755
@@ -14,7 +14,13 @@ fi
 
   case "$1" in
   binutils)
-     echo 2.23.0
+     if [ "$SRCARCH" = powerpc ]; then

Isn't this limitation only for ppc64le ?

Refer commit 60e065f70bdb ("powerpc: Reject binutils 2.24 when building little endian")

Quoted 6 lines
Quoted 4 lines

I do not see any CONFIG check in the current checkbin.

Refer commit a3ad84da0760 ("powerpc/toc: Future proof kernel toc")

That's odd. There is no toc on PPC32.

I think that's just a bug in a3ad84da0760.

Quoted 7 lines

But that means we inadvertantly dropped support for 2.24 about 8 months ago, and no one noticed.

Let's see what the responses are to Nick's proposal to increase the minimum to 2.25.1.

cheers

Either way is fine with me, but in that case,
do I need to get a higher-level Ack from Linus?

The current one can go to the ppc tree
since apparently it does not affect any other arches.

Signature · 2 lines
Best Regards
Masahiro Yamada
#6 lore raw
In reply to Masahiro Yamada
Quoted 6 lines · Masahiro Yamada

The checkbin in arch/powerpc/Makefile errors out if ld <= 2.24. So, the requirement on PPC is binutils >= 2.25. It is cleaner to specify it in scripts/min-tool-version.sh. If binutils < 2.25 is used, the toolchain check will fail in the Kconfig stage going forward.

Thoughts on making binutils 2.25.1 the new minimal support version for all architectures? We already require GCC 5.1. Looking at

https://gcc.gnu.org/releases.html

that was released on April 22, 2015. Looking at

https://ftp.gnu.org/gnu/binutils/

2.25 was released on 2014-12-23 and 2.25.1 on 2015-07-21.

Current minimum is 2.23 released on 2012-10-22. Almost 10 years old.

Quoted 113 lines

Since binutils >= 2.25 is already required, another version test for --save-restore-funcs on PPC64 is always met.

PPC is the last user of ld-ifversion. With all the callers removed, the macro definition in scripts/Makefile.compiler can go away.

---

 arch/powerpc/Makefile       | 21 ---------------------
 arch/powerpc/lib/Makefile   |  8 --------
 scripts/Makefile.compiler   |  4 ----
 scripts/min-tool-version.sh |  8 +++++++-
 4 files changed, 7 insertions(+), 34 deletions(-)
arch/powerpc/Makefile +0 -21
index 02742facf895..fb607758eeca 100644
@@ -46,13 +46,7 @@ UTS_MACHINE := $(subst $(space),,$(machine-y))
 ifdef CONFIG_PPC32
 KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o
 else
-ifeq ($(call ld-ifversion, -ge, 22500, y),y)
-# 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
@@ -395,8 +389,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
 
@@ -411,16 +403,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 +0 -8
index 8560c912186d..5eb3971ccb9c 100644
@@ -38,14 +38,6 @@ obj-$(CONFIG_PPC32)  += div64.o copy_32.o crtsavres.o
 
 obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o
 
-# See corresponding test in arch/powerpc/Makefile
-# 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)
-extra-$(CONFIG_PPC64)  += crtsavres.o
-endif
-
 obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \
                               memcpy_power7.o restart_table.o
 
scripts/Makefile.compiler +0 -4
index 94d0d40cddb3..63e7d79dd877 100644
@@ -68,7 +68,3 @@ cc-ifversion = $(shell [ $(CONFIG_GCC_VERSION)0 $(1) $(2)000 ] && echo $(3) || e
 # 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))
scripts/min-tool-version.sh +7 -2
index 250925aab101..7df9f2150ea1 100755
@@ -14,7 +14,13 @@ fi
 
 case "$1" in
 binutils)
-       echo 2.23.0
+       if [ "$SRCARCH" = powerpc ]; then
+               # binutils 2.24 miscompiles weak symbols in some circumstances
+               # binutils 2.23 do not define the TOC symbol
+               echo 2.25.0
+       else
+               echo 2.23.0
+       fi
        ;;
 gcc)
        echo 5.1.0
--

2.34.1

Signature · 2 lines
Thanks,
~Nick Desaulniers