diff --git a/gcc.spec b/gcc.spec index 4d95ed8..d43d1f1 100644 --- a/gcc.spec +++ b/gcc.spec @@ -166,7 +166,7 @@ Summary: Various compilers (C, C++, Objective-C, ...) Name: gcc Version: %{gcc_version} -Release: %{gcc_release}.1%{?dist}.alma.1 +Release: %{gcc_release}.2%{?dist}.alma.1 # License notes for some of the less obvious ones: # gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para # isl: MIT, BSD-2-Clause @@ -345,6 +345,7 @@ Patch3000: gcc14-tests-dg-regexp.patch Patch3001: gcc14-tests-installed-site-exp.patch Patch3002: gcc14-tests-installed-target.patch Patch3003: gcc14-tests-installed-plugin.patch +Patch3004: gcc14-tests-ssp-native.patch # On ARM EABI systems, we do want -gnueabi to be part of the # target triple. @@ -1202,6 +1203,7 @@ touch -r isl-0.24/m4/ax_prog_cxx_for_build.m4 isl-0.24/m4/ax_prog_cc_for_build.m %patch -P3001 -p1 -b .gcc14-tests-installed-site-exp %patch -P3002 -p1 -b .gcc14-tests-installed-target %patch -P3003 -p1 -b .gcc14-tests-installed-plugin +%patch -P3004 -p1 -b .gcc14-tests-ssp-native %ifarch %{arm} rm -f gcc/testsuite/go.test/test/fixedbugs/issue19182.go @@ -4501,10 +4503,14 @@ end %{sysroot_prefix}/test-support/auto-host.h %changelog -* Thu Dec 18 2025 Eduard Abdullin - 14.3.1-4.1.alma.1 +* Sat Jan 10 2026 Eduard Abdullin - 14.3.1-4.2.alma.1 - Change to almalinux bugtracker - Set --with-arch_64=x86-64-v2 on v2 arch +* Tue Jan 6 2026 Joseph Myers - 14.3.1-4.2 +- fixes for testing non-production cross compilers (RHEL-114521) + - enable stack-protector tests in cross testing + * Mon Dec 15 2025 Joseph Myers - 14.3.1-4.1 - fixes for testing non-production cross compilers (RHEL-114521) - include libstdc++fs.a and libstdc++exp.a in sysroot packages diff --git a/gcc14-tests-ssp-native.patch b/gcc14-tests-ssp-native.patch new file mode 100644 index 0000000..0083c8b --- /dev/null +++ b/gcc14-tests-ssp-native.patch @@ -0,0 +1,55 @@ +commit 531150b1ac41a6aebfa39dec28730c9f3b10a930 +Author: Joseph Myers +Date: Tue Jan 6 22:11:20 2026 +0000 + + testsuite: Do not restrict stack protector tests to native testing + + Three stack protector tests in gcc.dg use + + /* { dg-do run { target native } } */ + + for no apparent reason, since there is nothing in those tests that + should care about the difference between native and cross testing. + They also have + + /* { dg-require-effective-target fstack_protector } */ + + which is the actually relevant condition for such tests. Remove the + { target native } restriction. + + Tested natively for x86_64-pc-linux-gnu, and with cross to + aarch64-linux. + + * gcc.dg/ssp-1.c, gcc.dg/ssp-2.c, gcc.dg/stackprotectexplicit1.c: + Do not restrict to { target native }. + +diff --git a/gcc/testsuite/gcc.dg/ssp-1.c b/gcc/testsuite/gcc.dg/ssp-1.c +index db693327f701..74cdb96049c9 100644 +--- a/gcc/testsuite/gcc.dg/ssp-1.c ++++ b/gcc/testsuite/gcc.dg/ssp-1.c +@@ -1,4 +1,4 @@ +-/* { dg-do run { target native } } */ ++/* { dg-do run } */ + /* { dg-options "-fstack-protector" } */ + /* { dg-require-effective-target fstack_protector } */ + +diff --git a/gcc/testsuite/gcc.dg/ssp-2.c b/gcc/testsuite/gcc.dg/ssp-2.c +index 608ca3000323..22f31d994081 100644 +--- a/gcc/testsuite/gcc.dg/ssp-2.c ++++ b/gcc/testsuite/gcc.dg/ssp-2.c +@@ -1,4 +1,4 @@ +-/* { dg-do run { target native } } */ ++/* { dg-do run } */ + /* { dg-options "-fstack-protector" } */ + /* { dg-options "-fstack-protector -Wl,-multiply_defined,suppress" { target *-*-darwin* } } */ + /* { dg-prune-output "-multiply_defined is obsolete" } */ +diff --git a/gcc/testsuite/gcc.dg/stackprotectexplicit1.c b/gcc/testsuite/gcc.dg/stackprotectexplicit1.c +index 658c297d9f58..bb59b7fadd1f 100644 +--- a/gcc/testsuite/gcc.dg/stackprotectexplicit1.c ++++ b/gcc/testsuite/gcc.dg/stackprotectexplicit1.c +@@ -1,4 +1,4 @@ +-/* { dg-do run { target native } } */ ++/* { dg-do run } */ + /* { dg-options "-fstack-protector-explicit" } */ + /* { dg-require-effective-target fstack_protector } */ +