!247 [Backport] State --sysroot option as validated once processed

From: @huitailangzju 
Reviewed-by: @li-yancheng 
Signed-off-by: @li-yancheng
This commit is contained in:
openeuler-ci-bot 2023-03-06 01:25:34 +00:00 committed by Gitee
commit 0f3c849db8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 40 additions and 1 deletions

View File

@ -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

View File

@ -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