From d82f8b861e194d8b67a3faf9ca787db8de60c416 Mon Sep 17 00:00:00 2001
From: Xu Jin <jinxu@kylinos.cn>
Date: Mon, 13 May 2024 18:16:46 +0800
Subject: [PATCH] Merge duplicate compile flags

---
 gcc.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gcc.spec b/gcc.spec
index b3db8a5..fe49011 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -2,7 +2,7 @@
 %global gcc_major 12
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 29
+%global gcc_release 30
 
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
@@ -1131,11 +1131,7 @@ CC="$CC" CXX="$CXX" \
 	--enable-languages=c,c++,fortran${enablelobjc}${enablelada}${enablelgo}${enableld},lto \
 	$CONFIGURE_OPTS
 
-%ifarch sparc sparcv9 sparc64
-make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
-%else
 make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" LDFLAGS_FOR_TARGET=-Wl,-z,relro,-z,now
-%endif
 
 CC="`%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-cc`"
 CXX="`%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-cxx` `%{gcc_target_platform}/libstdc++-v3/scripts/testsuite_flags --build-includes`"
@@ -3263,6 +3259,10 @@ end
 %doc rpm.doc/changelogs/libcc1/ChangeLog*
 
 %changelog
+* Mon May 13 2024 Xu Jin <jinxu@kylinos.cn> - 12.3.1-30
+- Type: Update
+- DESC: Merge duplicate compile flags.
+
 * Sat May 11 2024 tiancheng-bao <baotiancheng1@huawei.com> - 12.3.1-29
 - Type: Sync
 - DESC: Sync bug fix patch from openeuler/gcc
-- 
Gitee