toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_13 blind option
PATCH v2 1/8 toolchain/Config.in: add BR2_TOOLCHAIN_GCC_AT_LEAST_13 blind option
In order to add gcc 13 support for internal and external toolchain in follow-up commits, introduce BR2_TOOLCHAIN_GCC_AT_LEAST_13 symbol.
--- toolchain/Config.in | 5 +++++ 1 file changed, 5 insertions(+)
toolchain/Config.in +5 -0
@@ -752,10 +752,15 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_12 bool select BR2_TOOLCHAIN_GCC_AT_LEAST_11 +config BR2_TOOLCHAIN_GCC_AT_LEAST_13 + bool + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 + # This order guarantees that the highest version is set, as kconfig # stops affecting a value on the first matching default. config BR2_TOOLCHAIN_GCC_AT_LEAST string + default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13 default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 default "10" if BR2_TOOLCHAIN_GCC_AT_LEAST_10
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 2/8 toolchain/toolchain-external/toolchain-external-custom: add gcc 13 version selection
This patch allows to use an external toolchain based on gcc 13.
--- .../toolchain-external-custom/Config.in.options | 4 ++++ 1 file changed, 4 insertions(+)
toolchain/toolchain-external/toolchain-external-custom/Config.in.options +4 -0
@@ -46,6 +46,10 @@ choice Set to the gcc version that is used by your external toolchain. +config BR2_TOOLCHAIN_EXTERNAL_GCC_13 + bool "13.x" + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + config BR2_TOOLCHAIN_EXTERNAL_GCC_12 bool "12.x" select BR2_TOOLCHAIN_GCC_AT_LEAST_12
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 3/8 package/gcc: add support for gcc 13
In reply to Romain Naourhttps://gcc.gnu.org/gcc-13/changes.html
https://gcc.gnu.org/gcc-13/porting_to.html
Backport upstream patch to gcc 13.2 for RISC-V build issue with gcc 4.9.x:
GCC should still build with GCC 4.8.3 or newer [1] using C++03 by default. But a recent change in RISC-V port introduced a C++11 feature "std::log2" [2].
Use log2 from the C header, without the namespace [3].
[1] https://gcc.gnu.org/install/prerequisites.html
[2] https://gcc.gnu.org/git/?p=gcc.git;a=patch;h=7caa1ae5e451e780fbc4746a54e3f19d4f4304dc
[3] https://stackoverflow.com/questions/26733413/error-log2-is-not-a-member-of-std
Rebase patch 0001-disable-split-stack-for-non-thread-builds.patch required for uClibc-ng without threads support.
Fixes:
https://gitlab.com/buildroot.org/toolchains-builder/-/jobs/4202276589
Runtime tested on gitlab-ci:
https://gitlab.com/kubu93/buildroot/-/pipelines/947874770/
---
efl2flt for riscv64 is broken with gcc >= 13.1
https://gitlab.com/DocSepp/buildroot/-/jobs/4197460843
v2: bump to gcc 13.2
--- ...le-split-stack-for-non-thread-builds.patch | 26 ++++++++++ ...ISC-V-fix-build-issue-with-gcc-4.9.x.patch | 48 +++++++++++++++++++ package/gcc/Config.in.host | 14 ++++++ package/gcc/gcc.hash | 2 + 4 files changed, 90 insertions(+) create mode 100644 package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch create mode 100644 package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch
package/gcc/13.2.0/0001-disable-split-stack-for-non-thread-builds.patch new file +26 -0
@@ -0,0 +1,26 @@ +From 4f67134e0b1404fef4ea72342be8fab4c37ca8c8 Mon Sep 17 00:00:00 2001 +From: Waldemar Brodkorb <[email protected]> +Date: Mon, 25 Jul 2022 00:29:55 +0200 +Subject: [PATCH] disable split-stack for non-thread builds + +Signed-off-by: Waldemar Brodkorb <[email protected]> +[Romain: convert to git format] +Signed-off-by: Romain Naour <[email protected]> +--- + libgcc/config/t-stack | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack +index cc0366b4cd8..f3f97e86d60 100644 +--- a/libgcc/config/t-stack ++++ b/libgcc/config/t-stack +@@ -1,4 +1,6 @@ + # Makefile fragment to provide generic support for -fsplit-stack. + # This should be used in config.host for any host which supports + # -fsplit-stack. ++ifeq ($(enable_threads),yes) + LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c ++endif +-- +2.34.3 +
package/gcc/13.2.0/0002-RISC-V-fix-build-issue-with-gcc-4.9.x.patch new file +48 -0
48 lines not on this page · raw message
package/gcc/Config.in.host +14 -0
@@ -59,6 +59,19 @@ config BR2_GCC_VERSION_12_X depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_12 +config BR2_GCC_VERSION_13_X + bool "gcc 13.x" + # powerpc spe support has been deprecated since gcc 8.x. + # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html + depends on !BR2_powerpc_SPE + # uClibc-ng broken on sparc due to recent gcc changes + # that need to be reverted since gcc 8.4, 9.3 and 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 + depends on !BR2_sparc + # ARC HS48 rel 31 only supported by gcc arc fork. + depends on !BR2_archs4x_rel31 + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 + endchoice # libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x
@@ -89,6 +102,7 @@ config BR2_GCC_VERSION default "10.4.0" if BR2_GCC_VERSION_10_X default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X + default "13.2.0" if BR2_GCC_VERSION_13_X default "arc-2020.09-release" if BR2_GCC_VERSION_ARC config BR2_EXTRA_GCC_CONFIG_OPTIONS
package/gcc/gcc.hash +2 -0
@@ -6,6 +6,8 @@ sha512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3c sha512 a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14 gcc-11.4.0.tar.xz # From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum sha512 8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204 gcc-12.3.0.tar.xz +# From https://gcc.gnu.org/pub/gcc/releases/gcc-13.2.0/sha512.sum +sha512 d99e4826a70db04504467e349e9fbaedaa5870766cda7c5cab50cdebedc4be755ebca5b789e1232a34a20be1a0b60097de9280efe47bdb71c73251e30b0862a2 gcc-13.2.0.tar.xz # Locally calculated (fetched from Github) sha512 b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c gcc-arc-2020.09-release.tar.gz
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 4/8 arch/Config.in: add BR2_ARCH_NEEDS_GCC_AT_LEAST_13
In reply to Romain NaourThis new symbol will be used by architectures introduced with gcc 13.
--- arch/Config.in | 4 ++++ package/gcc/Config.in.host | 1 + 2 files changed, 5 insertions(+)
arch/Config.in +4 -0
@@ -304,6 +304,10 @@ config BR2_ARCH_NEEDS_GCC_AT_LEAST_12 bool select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 +config BR2_ARCH_NEEDS_GCC_AT_LEAST_13 + bool + select BR2_ARCH_NEEDS_GCC_AT_LEAST_12 + # The following string values are defined by the individual # Config.in.$ARCH files config BR2_ARCH
package/gcc/Config.in.host +1 -0
@@ -48,6 +48,7 @@ config BR2_GCC_VERSION_11_X config BR2_GCC_VERSION_12_X bool "gcc 12.x" + depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_13 # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 5/8 package/gcc: switch to gcc 12.x as the default
In reply to Romain NaourEven if gcc 11 is still maintained for some time, switch to gcc 12.x since it has been released since 2022-05-06 and gcc 13.x is available since 2023-04-26.
We have been having toolchains in the autobuilders with gcc 12.x for a while, so the vast majority of the problems should have already been solved.
--- package/gcc/Config.in.host | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/gcc/Config.in.host +1 -1
@@ -5,7 +5,7 @@ choice default BR2_GCC_VERSION_ARC if BR2_GCC_VERSION_4_8_ARC # legacy default BR2_GCC_VERSION_ARC if BR2_arc default BR2_GCC_VERSION_POWERPC_SPE if BR2_powerpc_SPE - default BR2_GCC_VERSION_11_X + default BR2_GCC_VERSION_12_X help Select the version of gcc you wish to use.
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 6/8 configs: remove qemu_sparc_ss10_defconfig
In reply to Romain NaourSince gcc 11 [1] the sparc architecture is disabled since it produce a non working image. Buildroot now provide gcc 13.x, 12.x and 11.x and we are going to remove gcc 10 that was the last working release (thanks to a local patch).
First remove qemu_sparc_ss10_defconfig since it will no longer be possible to build it with the internal toolchain backend.
---
v2: remove this defconfig
--- configs/qemu_sparc_ss10_defconfig | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 configs/qemu_sparc_ss10_defconfig
configs/qemu_sparc_ss10_defconfig deleted +0 -28
@@ -1,28 +0,0 @@ -# Architecture -BR2_sparc=y -BR2_sparc_v8=y - -# System -BR2_SYSTEM_DHCP="eth0" - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Image -BR2_ROOTFS_POST_IMAGE_SCRIPT="board/qemu/post-image.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_DEFCONFIG)" - -# Linux headers same as kernel -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y - -# Linux kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26" -BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sparc-ss10/linux.config" - -# host-qemu for gitlab testing -BR2_PACKAGE_HOST_QEMU=y -BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 7/8 arch/sparc: disable internal toolchain backend for sparc
In reply to Romain NaourSince gcc 11 [1] the sparc architecture is disabled since it produce a non working image. Buildroot now provide gcc 13.x, 12.x and 11.x and we are going to remove gcc 10 that was the last working release (thanks to a local patch).
We have to disable the internal toolchain backend for sparc before removing gcc 10. While at it, remove !BR2_sparc dependency for gcc 11.x, 12.x and 13.x.
[1] 2ab88dac293aed5adf2504e8b182f9d8a306b935
---
v2: disable disable internal toolchain backend for sparc
--- arch/Config.in | 5 +++++ package/gcc/Config.in.host | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-)
arch/Config.in +5 -0
@@ -216,6 +216,11 @@ config BR2_sh config BR2_sparc bool "SPARC" select BR2_USE_MMU + # uClibc-ng broken on sparc due to recent gcc changes + # that need to be reverted since gcc 8.4, 9.3 and 10.1. + # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 + # gcc <= 10.x has been removed from Buildroot. + select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT help SPARC (from Scalable Processor Architecture) is a RISC instruction set architecture (ISA) developed by Sun
package/gcc/Config.in.host +0 -12
@@ -38,10 +38,6 @@ config BR2_GCC_VERSION_11_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE - # uClibc-ng broken on sparc due to recent gcc changes - # that need to be reverted since gcc 8.4, 9.3 and 10.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 - depends on !BR2_sparc # ARC HS48 rel 31 only supported by gcc arc fork. depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_11
@@ -52,10 +48,6 @@ config BR2_GCC_VERSION_12_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE - # uClibc-ng broken on sparc due to recent gcc changes - # that need to be reverted since gcc 8.4, 9.3 and 10.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 - depends on !BR2_sparc # ARC HS48 rel 31 only supported by gcc arc fork. depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_12
@@ -65,10 +57,6 @@ config BR2_GCC_VERSION_13_X # powerpc spe support has been deprecated since gcc 8.x. # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html depends on !BR2_powerpc_SPE - # uClibc-ng broken on sparc due to recent gcc changes - # that need to be reverted since gcc 8.4, 9.3 and 10.1. - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784 - depends on !BR2_sparc # ARC HS48 rel 31 only supported by gcc arc fork. depends on !BR2_archs4x_rel31 select BR2_TOOLCHAIN_GCC_AT_LEAST_13
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 8/8 package/gcc: remove gcc 10.x
In reply to Romain Naourgcc 13.2 is around, gcc 12.3 is the default version, so drop 10.4 in order to reduce the gcc choice.
--- Config.in.legacy | 7 + ...get-92095-internal-error-with-O1-mcp.patch | 328 ------------------ ...-mcmodel-option-to-handle-large-GOTs.patch | 200 ----------- ...-cmodel-large-when-building-crtstuff.patch | 60 ---- ...TRANT-for-OpenRISC-when-pthread-is-p.patch | 31 -- ...le-split-stack-for-non-thread-builds.patch | 26 -- ...-machine-names-in-__has_include-.-PR.patch | 124 ------- package/gcc/Config.in.host | 11 - 8 files changed, 7 insertions(+), 780 deletions(-) delete mode 100644 package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch delete mode 100644 package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch delete mode 100644 package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch delete mode 100644 package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch delete mode 100644 package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch delete mode 100644 package/gcc/10.4.0/0006-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch
Config.in.legacy +7 -0
@@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2023.08" +config BR2_GCC_VERSION_10_X + bool "gcc 10.x support removed" + select BR2_LEGACY + help + Support for gcc version 10.x has been removed. The current + default version (12.x or later) has been selected instead. + config BR2_KERNEL_HEADERS_6_3 bool "kernel headers version 6.3.x are no longer supported" select BR2_LEGACY
package/gcc/10.4.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch deleted +0 -328
328 lines not on this page · raw message
package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch deleted +0 -200
200 lines not on this page · raw message
package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch deleted +0 -60
60 lines not on this page · raw message
package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch deleted +0 -31
@@ -1,31 +0,0 @@ -From d2e4e3e72b5f2f68d595dfd3a77f58744f3f243e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls <[email protected]> -Date: Fri, 27 Mar 2020 21:23:53 +0100 -Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed - -The detection of pthread support fails on OpenRISC unless _REENTRANT -is defined. Added the CPP_SPEC definition to correct this. - -Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372 - -Signed-off-by: Bernd Kuhls <[email protected]> ---- - gcc/config/or1k/linux.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/or1k/linux.h b/gcc/config/or1k/linux.h -index 21cef067dda..2e1bb5601a9 100644 ---- a/gcc/config/or1k/linux.h -+++ b/gcc/config/or1k/linux.h -@@ -32,6 +32,8 @@ - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-or1k.so.1" - -+#define CPP_SPEC "%{pthread:-D_REENTRANT}" -+ - #undef LINK_SPEC - #define LINK_SPEC "%{h*} \ - %{static:-Bstatic} \ --- -2.34.3 -
package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch deleted +0 -26
@@ -1,26 +0,0 @@ -From 14336d46b35577300dd68147a8f0c8165684850b Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb <[email protected]> -Date: Mon, 25 Jul 2022 00:29:55 +0200 -Subject: [PATCH] disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb <[email protected]> -[Romain: convert to git format] -Signed-off-by: Romain Naour <[email protected]> ---- - libgcc/config/t-stack | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libgcc/config/t-stack b/libgcc/config/t-stack -index cc0366b4cd8..f3f97e86d60 100644 ---- a/libgcc/config/t-stack -+++ b/libgcc/config/t-stack -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif --- -2.34.3 -
package/gcc/10.4.0/0006-fixinc-don-t-fix-machine-names-in-__has_include-.-PR.patch deleted +0 -124
124 lines not on this page · raw message
package/gcc/Config.in.host +0 -11
@@ -22,16 +22,6 @@ config BR2_GCC_VERSION_POWERPC_SPE depends on BR2_powerpc_SPE select BR2_TOOLCHAIN_GCC_AT_LEAST_8 -config BR2_GCC_VERSION_10_X - bool "gcc 10.x" - depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_11 - # powerpc spe support has been deprecated since gcc 8.x. - # https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html - depends on !BR2_powerpc_SPE - # ARC HS48 rel 31 only supported by gcc arc fork. - depends on !BR2_archs4x_rel31 - select BR2_TOOLCHAIN_GCC_AT_LEAST_10 - config BR2_GCC_VERSION_11_X bool "gcc 11.x" depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_12
@@ -88,7 +78,6 @@ config BR2_GCC_SUPPORTS_DLANG config BR2_GCC_VERSION string default "8.4.0" if BR2_GCC_VERSION_POWERPC_SPE - default "10.4.0" if BR2_GCC_VERSION_10_X default "11.4.0" if BR2_GCC_VERSION_11_X default "12.3.0" if BR2_GCC_VERSION_12_X default "13.2.0" if BR2_GCC_VERSION_13_X
Signature · 6 lines
2.41.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 7 lines · On Fri, 28 Jul 2023 00:25:37 +0200 Romain Naour <[email protected]> wrote:
In order to add gcc 13 support for internal and external toolchain in follow-up commits, introduce
BR2_TOOLCHAIN_GCC_AT_LEAST_13symbol.Signed-off-by Romain Naour <[email protected]>--- toolchain/Config.in | 5 +++++ 1 file changed, 5 insertions(+)
Entire series applied. Thanks!
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot