From dbf4b047a09bcc634cbf543e89ca0c016310336f Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Mon, 12 Aug 2024 10:50:40 +0100 Subject: [PATCH] toolchain: bump gcc 14 to 14.2.0 Patches automatically rebased. Signed-off-by: Rui Salvaterra --- toolchain/gcc/Config.version | 2 +- toolchain/gcc/common.mk | 4 ++-- .../gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index dc2ff9bff037cd..49bb36865eebb9 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -15,7 +15,7 @@ config GCC_VERSION default EXTERNAL_GCC_VERSION if EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN default "11.3.0" if GCC_VERSION_11 default "12.3.0" if GCC_VERSION_12 - default "14.1.0" if GCC_VERSION_14 + default "14.2.0" if GCC_VERSION_14 default "13.3.0" config GCC_USE_DEFAULT_VERSION diff --git a/toolchain/gcc/common.mk b/toolchain/gcc/common.mk index 2161ce72e4a554..0ccf55bd313ca2 100644 --- a/toolchain/gcc/common.mk +++ b/toolchain/gcc/common.mk @@ -42,8 +42,8 @@ ifeq ($(PKG_VERSION),13.3.0) PKG_HASH:=0845e9621c9543a13f484e94584a49ffc0129970e9914624235fc1d061a0c083 endif -ifeq ($(PKG_VERSION),14.1.0) - PKG_HASH:=e283c654987afe3de9d8080bc0bd79534b5ca0d681a73a11ff2b5d3767426840 +ifeq ($(PKG_VERSION),14.2.0) + PKG_HASH:=a7b39bc69cbf9e25826c5a60ab26477001f7c08d85cec04bc0e29cabed6f3cc9 endif PATCH_DIR=../patches-$(GCC_MAJOR_VERSION).x diff --git a/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch b/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch index 2d65ba1b1f0278..2cbffe451724ad 100644 --- a/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch +++ b/toolchain/gcc/patches-14.x/300-mips_Os_cpu_rtx_cost_model.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/gcc/config/mips/mips.cc +++ b/gcc/config/mips/mips.cc -@@ -20444,7 +20444,7 @@ mips_option_override (void) +@@ -20453,7 +20453,7 @@ mips_option_override (void) flag_pcc_struct_return = 0; /* Decide which rtx_costs structure to use. */