From 82f12e493bee51f41aaa6b2eadb0c79efab93485 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Tue, 14 Jul 2026 13:56:02 +0800 Subject: [PATCH 1/2] SPECS: gcc15: change sequential number of fmin/fmax fix patch Although 1000 isn't used before this, listing it as 1000 will imply the next upstream backport patch should come as 1001, which will leads to confliction. Change it to 2000 instead. Signed-off-by: Icenowy Zheng --- SPECS/gcc15/gcc15.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/gcc15/gcc15.spec b/SPECS/gcc15/gcc15.spec index fdcf468b2e..6891bba455 100644 --- a/SPECS/gcc15/gcc15.spec +++ b/SPECS/gcc15/gcc15.spec @@ -191,7 +191,7 @@ Patch1034: 0034-RISC-V-Update-Profiles-string-in-RV23.patch Patch1035: 0035-RISC-V-Add-Profiles-RVA-B23S64-support.patch Patch1036: 0036-RISC-V-check-if-we-can-vec_extract.patch # Fix tree vectorization breaking NaN handling of fmin/fmax -Patch1000: 1000-UPSTREAM-RISC-V-Change-initial-value-for-fmin-fmax-autovec-re.patch +Patch2000: 1000-UPSTREAM-RISC-V-Change-initial-value-for-fmin-fmax-autovec-re.patch %description Core package for the GNU Compiler Collection, including the C language From d055ac1d5faa0c0382b988e096465ff49a74dc4e Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Tue, 14 Jul 2026 13:58:05 +0800 Subject: [PATCH 2/2] SPECS: gcc16: switch to %autopatch Currently the patch numbers are hardcoded with a %patch macro, which leads to the fmin/fmax patch being not applied. Change it to a %autopatch. Signed-off-by: Icenowy Zheng --- SPECS/gcc16/gcc16.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/gcc16/gcc16.spec b/SPECS/gcc16/gcc16.spec index 38b4cb65b9..da622a583f 100644 --- a/SPECS/gcc16/gcc16.spec +++ b/SPECS/gcc16/gcc16.spec @@ -550,7 +550,7 @@ Runtime library for the GNU Modula-2 language. %setup -q -n gcc-%{version} #test patching start -%patch -p1 -P 2000 -P 2001 +%autopatch -p1 -m 1000 #test patching end %build