[Revert] Revert PGO-kernel-Add-fkernel-pgo-option-to-support-PGO-ker.patch

(cherry picked from commit 40eec89cf1719366370bd7eb41b8a8c60964ba22)

0097-PGO-kernel-Add-fkernel-pgo-option-to-support-PGO-ker.patch

@@ -1,46 +0,0 @@
-From 90d3ef0637c66045eeab78ccf04e9ff51b9b451a Mon Sep 17 00:00:00 2001
-From: xiongzhou4 <xiongzhou4@huawei.com>
-Date: Thu, 1 Jun 2023 09:28:27 +0800
-Subject: [PATCH 5/5] [PGO kernel] Add fkernel-pgo option to support PGO kernel
- compilation.
-
-If specified, disable TLS setting of instrumentation variables in
-gcc/tree-profile.c, as kernel does not support TLS.
----
- gcc/common.opt     | 4 ++++
- gcc/tree-profile.c | 4 +++-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/gcc/common.opt b/gcc/common.opt
-index 238c97db8..6f0ed7cea 100644
---- a/gcc/common.opt
-+++ b/gcc/common.opt
-@@ -2302,6 +2302,10 @@ fprofile-generate=
- Common Joined RejectNegative
- Enable common options for generating profile info for profile feedback directed optimizations, and set -fprofile-dir=.
- 
-+fkernel-pgo
-+Common Report Var(flag_kernel_pgo) Optimization Init(0)
-+Disable TLS setting of instrumentation variables to support PGO kernel compilation in -fprofile-generate, as kernel does not support TLS.
-+
- fprofile-partial-training
- Common Report Var(flag_profile_partial_training) Optimization
- Do not assume that functions never executed during the train run are cold.
-diff --git a/gcc/tree-profile.c b/gcc/tree-profile.c
-index 6c0838261..924817472 100644
---- a/gcc/tree-profile.c
-+++ b/gcc/tree-profile.c
-@@ -105,7 +105,9 @@ init_ic_make_global_vars (void)
-   DECL_ARTIFICIAL (ic_tuple_var) = 1;
-   DECL_INITIAL (ic_tuple_var) = NULL;
-   DECL_EXTERNAL (ic_tuple_var) = 1;
--  if (targetm.have_tls)
-+  /* Disable TLS setting when compiling kernel in -fprofile-generate,
-+     as kernel does not support TLS. */
-+  if (targetm.have_tls && !flag_kernel_pgo)
-     set_decl_tls_model (ic_tuple_var, decl_default_tls_model (ic_tuple_var));
- }
- 
--- 
-2.33.0
-

gcc.spec

@@ -61,7 +61,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: 30
+Release: 31
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL: https://gcc.gnu.org
 
@@ -197,14 +197,13 @@ Patch85: 0085-loop-distribution-Bugfix-for-loop-distribution.patch
 Patch86: 0086-semi-relayout-Bugfix-for-struct-semi-relayout.patch
 Patch87: 0087-Backport-tree-optimization-97238-fix-typo-causing-IC.patch
 Patch88: 0088-Backport-fix-typo-causing-ICE.patch
-Patch90: 0090-State-sysroot-option-as-validated-once-processed.patch
-Patch91: 0091-bogus-Wstringop-overflow-with-VLA-of-elements-larger.patch
-Patch92: 0092-phiopt2-Add-option-to-control-the-simplify.patch
-Patch93: 0093-gimple-Factor-the-code-to-avoid-depending-auto-featu.patch
-Patch94: 0094-StructReorg-Fix-escape_cast_another_ptr-check-bug.patch
-Patch95: 0095-Backport-Fix-zero-masking-for-vcvtps2ph-when-dest-op.patch
-Patch96: 0096-Struct-reorg-Fix-the-use-of-as_a.patch
-Patch97: 0097-PGO-kernel-Add-fkernel-pgo-option-to-support-PGO-ker.patch
+Patch89: 0089-State-sysroot-option-as-validated-once-processed.patch
+Patch90: 0090-bogus-Wstringop-overflow-with-VLA-of-elements-larger.patch
+Patch91: 0091-phiopt2-Add-option-to-control-the-simplify.patch
+Patch92: 0092-gimple-Factor-the-code-to-avoid-depending-auto-featu.patch
+Patch93: 0093-StructReorg-Fix-escape_cast_another_ptr-check-bug.patch
+Patch94: 0094-Backport-Fix-zero-masking-for-vcvtps2ph-when-dest-op.patch
+Patch95: 0095-Struct-reorg-Fix-the-use-of-as_a.patch
 
 %global gcc_target_platform %{_arch}-linux-gnu
 
@@ -747,14 +746,13 @@ not stable, so plugins must be rebuilt any time GCC is updated.
 %patch86 -p1
 %patch87 -p1
 %patch88 -p1
+%patch89 -p1
 %patch90 -p1
 %patch91 -p1
 %patch92 -p1
 %patch93 -p1
 %patch94 -p1
 %patch95 -p1
-%patch96 -p1
-%patch97 -p1
 
 %build
 
@@ -2779,6 +2777,12 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Sat Jun 3 2023 Wang Ding <wangding16@huawei.com> - 10.3.1-31
+- Type:Sync
+- ID:NA
+- SUG:NA
+- DESC:Revert patch97 and correct the incorrect patch number
+
 * Fri Jun 2 2023 Wang Ding <wangding16@huawei.com> - 10.3.1-30
 - Type:Sync
 - ID:NA