From c5341213b8495aa7627588eb34d59c9c74a83814 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Wed, 1 Feb 2023 16:47:05 +0800 Subject: [PATCH] remove some unsupported sec_opt for loongarch --- gcc_secure.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc_secure.spec b/gcc_secure.spec index 16de4b5..12f9e44 100644 --- a/gcc_secure.spec +++ b/gcc_secure.spec @@ -3,7 +3,7 @@ Summary: Enforcing secure compile options for abuild License: NA Group: System/Management Version: 1.0 -Release: 0.11 +Release: 0.12 BuildRoot: %{_tmppath}/%{name}-%{version} BuildRequires: util-linux coreutils @@ -56,6 +56,11 @@ if ! cat /.build.command | egrep "\$gcc_secure_exclude" &>/dev/null; then sec_opt=\`echo \$sec_opt | sed 's/-fPIC / /'\` fi + if [[ `uname -m` = "loongarch64" ]];then + sec_opt=`echo $sec_opt | sed 's/-Wl,-z,relro -Wl,-z,now -Wl,-z,noexecstack / /'` + echo $@ | grep "-mdirect-extern-access" >>/dev/null && sec_opt=`echo $sec_opt | sed 's/-fPIC / /'` + fi + if [[ x\$rpm_name = "xglibc" ]] || [[ x\$rpm_name = "xcompat-glibc" ]];then #glibc supply fs define, can not add fs for glibc self /usr/bin/gcc_old \$sec_opt "\$@" \$fs_opt --specs=/opt/gcc-specs-pie-cc1 --specs=/opt/gcc-specs-pie-ld @@ -159,6 +164,12 @@ rm -rf %{_tmppath}/%{name}-%{version} rm -rf $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Wed Feb 1 2023 Wenlong Zhang - 1.0-0.12 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: remove some unsupported sec_opt for loongarch + * Thu Apr 28 2022 zhangchenfeng - 1.0-0.11 - Type:enhancement - ID:NA -- Gitee