From 8d73fc1d241155b0d566e4335926fbf01d237dc2 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 13 Feb 2025 03:20:48 +0300 Subject: [PATCH] import gcc-11.5.0-5.el9_5 --- SOURCES/gcc11-testsuite-fixes-4.patch | 38 +++++++++++++++++++++++++++ SPECS/gcc.spec | 18 +++++++++++-- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 SOURCES/gcc11-testsuite-fixes-4.patch diff --git a/SOURCES/gcc11-testsuite-fixes-4.patch b/SOURCES/gcc11-testsuite-fixes-4.patch new file mode 100644 index 0000000..cab2e7e --- /dev/null +++ b/SOURCES/gcc11-testsuite-fixes-4.patch @@ -0,0 +1,38 @@ +commit 181f40f5cf8510a16191e4768dadbe2cb7a5c095 +Author: Jakub Jelinek +Date: Wed Jul 24 18:00:05 2024 +0200 + + testsuite: Fix up pr116034.c test for big/pdp endian [PR116061] + + Didn't notice the memmove is into an int variable, so the test + was still failing on big endian. + + 2024-07-24 Jakub Jelinek + + PR tree-optimization/116034 + PR testsuite/116061 + * gcc.dg/pr116034.c (g): Change type from int to unsigned short. + (foo): Guard memmove call on __SIZEOF_SHORT__ == 2. + + (cherry picked from commit 69e69847e21a8d951ab5f09fd3421449564dba31) + +diff --git a/gcc/testsuite/gcc.dg/pr116034.c b/gcc/testsuite/gcc.dg/pr116034.c +index 9a31de03424..955b4c9e86b 100644 +--- a/gcc/testsuite/gcc.dg/pr116034.c ++++ b/gcc/testsuite/gcc.dg/pr116034.c +@@ -2,12 +2,13 @@ + /* { dg-do run } */ + /* { dg-options "-O1 -fno-strict-aliasing" } */ + +-int g; ++unsigned short int g; + + static inline int + foo (_Complex unsigned short c) + { +- __builtin_memmove (&g, 1 + (char *) &c, 2); ++ if (__SIZEOF_SHORT__ == 2) ++ __builtin_memmove (&g, 1 + (char *) &c, 2); + return g; + } + diff --git a/SPECS/gcc.spec b/SPECS/gcc.spec index c8fed28..d520456 100644 --- a/SPECS/gcc.spec +++ b/SPECS/gcc.spec @@ -4,7 +4,7 @@ %global gcc_major 11 # Note, gcc_release must be integer, if you want to add suffixes to # %%{release}, append them after %%{gcc_release} on Release: line. -%global gcc_release 2 +%global gcc_release 5 %global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e %global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0 %global _unpackaged_files_terminate_build 0 @@ -150,7 +150,7 @@ Source0: gcc-%{version}-%{DATE}.tar.xz Source1: nvptx-tools-%{nvptx_tools_gitrev}.tar.xz # The source for nvptx-newlib package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# git clone git://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp +# git clone https://sourceware.org/git/newlib-cygwin.git newlib-cygwin-dir.tmp # git --git-dir=newlib-cygwin-dir.tmp/.git archive --prefix=newlib-cygwin-%%{newlib_cygwin_gitrev}/ %%{newlib_cygwin_gitrev} ":(exclude)newlib/libc/sys/linux/include/rpc/*.[hx]" | xz -9e > newlib-cygwin-%%{newlib_cygwin_gitrev}.tar.xz # rm -rf newlib-cygwin-dir.tmp Source2: newlib-cygwin-%{newlib_cygwin_gitrev}.tar.xz @@ -298,6 +298,7 @@ Patch35: gcc11-testsuite-aarch64-add-fno-stack-protector.patch Patch36: gcc11-libgfortran-flush.patch Patch37: gcc11-pr113960.patch Patch38: gcc11-pr105157.patch +Patch39: gcc11-testsuite-fixes-4.patch Patch100: gcc11-fortran-fdec-duplicates.patch Patch101: gcc11-fortran-flogical-as-integer.patch @@ -901,6 +902,7 @@ mark them as cross compiled. %patch36 -p1 -b .libgfortran-flush~ %patch37 -p1 -b .pr113960~ %patch38 -p1 -b .pr105157~ +%patch39 -p1 -b .testsuite4~ %if 0%{?rhel} >= 9 %patch100 -p1 -b .fortran-fdec-duplicates~ @@ -1422,6 +1424,9 @@ then CONFIG_ARGS="$CONFIG_ARGS --without-annocheck" CONFIG_ARGS="$CONFIG_ARGS --without-tests" CONFIG_ARGS="$CONFIG_ARGS --disable-rpath" + CONFIG_ARGS="$CONFIG_ARGS --without-debuginfod" + CONFIG_ARGS="$CONFIG_ARGS --without-clang-plugin" + CONFIG_ARGS="$CONFIG_ARGS --without-llvm-plugin" comp_dir="%{_builddir}/gcc-%{version}-%{DATE}/obj-%{gcc_target_platform}/gcc/" ccompiler="%{_builddir}/gcc-%{version}-%{DATE}/obj-%{gcc_target_platform}/gcc/xgcc -B $comp_dir" @@ -3594,6 +3599,15 @@ end %endif %changelog +* Fri Feb 7 2025 Marek Polacek 11.5.0-5 +- rebuild for CVE-2020-11023 (RHEL-78373) + +* Mon Jan 27 2025 Marek Polacek 11.5.0-4 +- revert the PR middle-end/57245 patch (RHEL-76359) + +* Tue Jan 21 2025 Marek Polacek 11.5.0-3 +- honor -frounding-math in real truncation (PR middle-end/57245, RHEL-73749) + * Mon Jul 22 2024 Marek Polacek 11.5.0-2 - fix TARGET_CPU_DEFAULT (PR target/105157, RHEL-50037) - libstdc++: Workaround kernel-headers on s390x-linux (RHEL-50054)