diff --git a/0397-SVE-Fix-cross-compile-error.patch b/0397-SVE-Fix-cross-compile-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..eea0c05b5d483b0ce93e3f70217bd8a4216c0227 --- /dev/null +++ b/0397-SVE-Fix-cross-compile-error.patch @@ -0,0 +1,52 @@ +From 199bc51468591799feb7598c3bf0c4d15a100935 Mon Sep 17 00:00:00 2001 +From: blunce +Date: Mon, 1 Sep 2025 16:55:18 +0800 +Subject: [PATCH] [SVE] Fix cross compile error + +--- + gcc/gimple-ssa-expand-sve.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gcc/gimple-ssa-expand-sve.cc b/gcc/gimple-ssa-expand-sve.cc +index 12f5fe3ab..5df2dbddc 100644 +--- a/gcc/gimple-ssa-expand-sve.cc ++++ b/gcc/gimple-ssa-expand-sve.cc +@@ -35,7 +35,7 @@ along with GCC; see the file COPYING3. If not see + #include "cfgloop.h" + #include "gimple-ssa.h" + #include "gimple-pretty-print.h" +-#ifdef __aarch64__ ++#if defined (__aarch64__) && !defined (CROSS_DIRECTORY_STRUCTURE) + #include "config/aarch64/aarch64.h" + #endif + +@@ -94,7 +94,7 @@ public: + + virtual bool gate (function *fun) override + { +-#ifdef __aarch64__ ++#if defined (__aarch64__) && !defined (CROSS_DIRECTORY_STRUCTURE) + if (!flag_find_with_sve) + return false; + +@@ -112,7 +112,7 @@ public: + + virtual unsigned int execute (function *fun) override + { +-#ifdef __aarch64__ ++#if defined (__aarch64__) && !defined (CROSS_DIRECTORY_STRUCTURE) + TRACE_FUNCTION (fun->decl); + basic_block bb; + FOR_EACH_BB_FN (bb, fun) +@@ -130,7 +130,7 @@ virtual unsigned int execute (function *fun) override + } + + private: +-#ifdef __aarch64__ ++#if defined (__aarch64__) && !defined (CROSS_DIRECTORY_STRUCTURE) + uint8_t bit_width; + const char *null_name = ""; + +-- +2.28.0.windows.1 + diff --git a/gcc.spec b/gcc.spec index ce79695ad9d38b5a867baefd399f46484f6befb8..f424b3d7aa3e719726343162a9c04ac80c34cb26 100644 --- a/gcc.spec +++ b/gcc.spec @@ -2,7 +2,7 @@ %global gcc_major 12 # 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 97 +%global gcc_release 98 %global _unpackaged_files_terminate_build 0 %global _performance_build 1 @@ -506,6 +506,7 @@ Patch393: 0393-array-dse-Ignore-debug-stmt-add-testsuites.patch Patch394: 0394-SVE-Add-SVE-constraint.patch Patch395: 0395-update-ai-model.patch Patch396: 0396-Add-pattern-for-cmlt-and-change-hip12.patch +Patch397: 0397-SVE-Fix-cross-compile-error.patch # Part 1001-1999 %ifarch sw_64 @@ -1688,6 +1689,7 @@ not stable, so plugins must be rebuilt any time GCC is updated. %patch -P394 -p1 %patch -P395 -p1 %patch -P396 -p1 +%patch -P397 -p1 %ifarch sw_64 %patch -P1001 -p1 @@ -4315,6 +4317,10 @@ end %doc rpm.doc/changelogs/libcc1/ChangeLog* %changelog +* Mon Sep 1 2025 zhangjingwang - 12.3.1-98 +- Type: Sync +- DESC: Sync patches from openeuler/gcc. + * Mon Jul 21 2025 linhouzhong - 12.3.1-97 - Type: Sync - DESC: Sync patches from openeuler/gcc.