From a4679eb8902107c5b97339e6ebf30c5456fe5dfd Mon Sep 17 00:00:00 2001
From: liudabo <liudabo1@huawei.com>
Date: Wed, 17 Mar 2021 15:10:47 +0800
Subject: [PATCH] add SP and FS for x86

---
 gcc.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index 34ab6d6..ec9724c 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -37,7 +37,7 @@
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
 Version: 7.3.0
-Release: %{DATE}.36
+Release: %{DATE}.37
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 Group: Development/Languages
 #Source0: hcc-aarch64-linux-release.tar.bz2
@@ -695,8 +695,7 @@ cd ../..
 #test don't build
 %if 1 
 CC=gcc
-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/-Werror=format-security/ /g'`
 OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/ -pipe / /g'`
@@ -742,7 +741,7 @@ enablelada=,ada
 %if %{build_go}
 enablelgo=,go
 %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"
@@ -3285,6 +3284,12 @@ fi
 
 
 %changelog
+* Wed Mar 17 2021 tianwei <tianwei12@huawei.com> - 7.3.0-20210203.37
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add SP and FS for x86
+
 * Wed Feb 03 2021 eastb233 <xiezhiheng@huawei.com> - 7.3.0-20210203.36
 - gcc.spec: Add libubsan, libubsan-static, liblsan, liblsan-static rpm packages
 
-- 
Gitee