add SP and FS for x86

gcc.spec

@@ -59,7 +59,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{DATE}.16
+Release: %{DATE}.17
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL: https://gcc.gnu.org
 
@@ -785,8 +785,7 @@ export CONFIG_SITE=NONE
 
 CC=gcc
 CXX=g++
-OPT_FLAGS=`echo %{optflags}|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'`
-OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
+OPT_FLAGS=`echo %{optflags}|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/-Werror=format-security/ /g'`
@@ -827,7 +826,7 @@ enablelgo=,go
 %if %{build_d}
 enableld=,d
 %endif
-OPT_FLAGS="$OPT_FLAGS -fPIE -Wl,-z,relro,-z,now"
+OPT_FLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -Wl,-z,relro,-z,now"
 OPT_LDFLAGS="$OPT_LDFLAGS -Wl,-z,relro,-z,now"
 export extra_ldflags_libobjc="-Wl,-z,relro,-z,now"
 export FCFLAGS="$OPT_FLAGS"
@@ -2708,6 +2707,12 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Mon Mar 15 2021 tianwei <tianwei12@huawei.com> - 9.3.1-20210204.17
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add SP and FS for x86
+
 * Thu Feb 04 2021 eastb233 <xiezhiheng@huawei.com> - 9.3.1-20210204.16
 - Handle-POLY_INT_CSTs-in-declare_return_value.patch: New file
 - Handle-POLY_INT_CST-in-copy_reference_ops_from_ref.patch: New file