|
| 1 | +diff --git a/toolchain/Config.in b/toolchain/Config.in |
| 2 | +index 34e0ae2..7f3a73b 100644 |
| 3 | +--- a/toolchain/Config.in |
| 4 | ++++ b/toolchain/Config.in |
| 5 | +@@ -263,6 +263,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_110934 |
| 6 | + config BR2_TOOLCHAIN_HAS_GCC_BUG_111001 |
| 7 | + bool |
| 8 | + default y if BR2_sh |
| 9 | ++ default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_14 |
| 10 | + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_13 |
| 11 | + depends on BR2_OPTIMIZE_1 || \ |
| 12 | + BR2_OPTIMIZE_2 || \ |
| 13 | +@@ -790,10 +791,20 @@ config BR2_TOOLCHAIN_GCC_AT_LEAST_13 |
| 14 | + bool |
| 15 | + select BR2_TOOLCHAIN_GCC_AT_LEAST_12 |
| 16 | + |
| 17 | ++config BR2_TOOLCHAIN_GCC_AT_LEAST_14 |
| 18 | ++ bool |
| 19 | ++ select BR2_TOOLCHAIN_GCC_AT_LEAST_13 |
| 20 | ++ |
| 21 | ++config BR2_TOOLCHAIN_GCC_AT_LEAST_15 |
| 22 | ++ bool |
| 23 | ++ select BR2_TOOLCHAIN_GCC_AT_LEAST_14 |
| 24 | ++ |
| 25 | + # This order guarantees that the highest version is set, as kconfig |
| 26 | + # stops affecting a value on the first matching default. |
| 27 | + config BR2_TOOLCHAIN_GCC_AT_LEAST |
| 28 | + string |
| 29 | ++ default "15" if BR2_TOOLCHAIN_GCC_AT_LEAST_15 |
| 30 | ++ default "14" if BR2_TOOLCHAIN_GCC_AT_LEAST_14 |
| 31 | + default "13" if BR2_TOOLCHAIN_GCC_AT_LEAST_13 |
| 32 | + default "12" if BR2_TOOLCHAIN_GCC_AT_LEAST_12 |
| 33 | + default "11" if BR2_TOOLCHAIN_GCC_AT_LEAST_11 |
| 34 | +diff --git a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options |
| 35 | +index 5554d56..2e75305 100644 |
| 36 | +--- a/toolchain/toolchain-external/toolchain-external-custom/Config.in.options |
| 37 | ++++ b/toolchain/toolchain-external/toolchain-external-custom/Config.in.options |
| 38 | +@@ -46,6 +46,14 @@ choice |
| 39 | + Set to the gcc version that is used by your external |
| 40 | + toolchain. |
| 41 | + |
| 42 | ++config BR2_TOOLCHAIN_EXTERNAL_GCC_15 |
| 43 | ++ bool "15.x" |
| 44 | ++ select BR2_TOOLCHAIN_GCC_AT_LEAST_15 |
| 45 | ++ |
| 46 | ++config BR2_TOOLCHAIN_EXTERNAL_GCC_14 |
| 47 | ++ bool "14.x" |
| 48 | ++ select BR2_TOOLCHAIN_GCC_AT_LEAST_14 |
| 49 | ++ |
| 50 | + config BR2_TOOLCHAIN_EXTERNAL_GCC_13 |
| 51 | + bool "13.x" |
| 52 | + select BR2_TOOLCHAIN_GCC_AT_LEAST_13 |
0 commit comments