From c84b6e24e403a3ba613b150926f2780b4a887bfd Mon Sep 17 00:00:00 2001
From: huitailangzju <804544223@qq.com>
Date: Sun, 26 Feb 2023 21:26:07 +0800
Subject: [PATCH] [Backport] State --sysroot option as validated once processed

[Reference] https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=8e86086bd33134467cc9c2a75327d1238dc71df9
State --sysroot option as validated once processed

(cherry picked from commit ff72fea4aca704fbf11e0c2baed7cd710f70601d)
---
 ...t-option-as-validated-once-processed.patch | 30 +++++++++++++++++++
 gcc.spec                                      | 11 ++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 0090-State-sysroot-option-as-validated-once-processed.patch

diff --git a/0090-State-sysroot-option-as-validated-once-processed.patch b/0090-State-sysroot-option-as-validated-once-processed.patch
new file mode 100644
index 0000000..a3da278
--- /dev/null
+++ b/0090-State-sysroot-option-as-validated-once-processed.patch
@@ -0,0 +1,30 @@
+From a7c23eb36641d605df37f5942d188a764a2480f9 Mon Sep 17 00:00:00 2001
+From: huitailangzju <804544223@qq.com>
+Date: Tue, 14 Feb 2023 10:54:10 +0800
+Subject: [PATCH] State --sysroot option as validated once processed
+
+[Reference] https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=8e86086bd33134467cc9c2a75327d1238dc71df9
+
+Since we now save the option in the "switches" table
+to let specs use it more generally, we need to explicitly
+state that the option was validated else the driver
+will consider it "unrecognized".
+---
+ gcc/gcc.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/gcc/gcc.c b/gcc/gcc.c
+index 655beffcc..efa0b53ce 100644
+--- a/gcc/gcc.c
++++ b/gcc/gcc.c
+@@ -4193,6 +4193,7 @@ driver_handle_option (struct gcc_options *opts,
+       /* Saving this option is useful to let self-specs decide to
+ 	 provide a default one.  */
+       do_save = true;
++      validated = true;
+       break;
+ 
+     case OPT_time_:
+-- 
+2.28.0.windows.1
+
diff --git a/gcc.spec b/gcc.spec
index d131dfd..d298353 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -61,7 +61,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: 22
+Release: 23
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL: https://gcc.gnu.org
 
@@ -203,6 +203,7 @@ 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
 Patch89: 0089-Backport-libsanitizer-cherry-pick-9cf13067cb5088626b.patch
+Patch90: 0090-State-sysroot-option-as-validated-once-processed.patch
 
 %global gcc_target_platform %{_arch}-linux-gnu
 
@@ -746,6 +747,7 @@ not stable, so plugins must be rebuilt any time GCC is updated.
 %patch87 -p1
 %patch88 -p1
 %patch89 -p1
+%patch90 -p1
 
 %build
 
@@ -2769,6 +2771,13 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Sun Feb 26 2023 huitailang <804544223@qq.com> - 10.3.1-23
+- Type:Sync
+- ID:NA
+- SUG:NA
+- DESC:Sync patch from openeuler/gcc
+       Fix sysroot option once processed.
+
 * Tue Jan 10 2023 liyancheng <412998149@qq.com> - 10.3.1-22
 - Type:Sync
 - ID:NA
-- 
Gitee