From 34d2dde54adcd773eccec7c28000227b6eec9abd Mon Sep 17 00:00:00 2001 From: liudabo Date: Wed, 17 Mar 2021 15:21:56 +0800 Subject: [PATCH 01/25] 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 - 7.3.0-20210203.37 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add SP and FS for x86 + * Wed Feb 03 2021 eastb233 - 7.3.0-20210203.36 - gcc.spec: Add libubsan, libubsan-static, liblsan, liblsan-static rpm packages -- Gitee From 2724ecb6957c87c9283f64b0a2e28a31e31a4651 Mon Sep 17 00:00:00 2001 From: weiwei_150212 Date: Fri, 19 Mar 2021 14:17:37 +0800 Subject: [PATCH 02/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index ec9724c..1a5f8ab 100644 --- a/gcc.spec +++ b/gcc.spec @@ -741,7 +741,7 @@ enablelada=,ada %if %{build_go} enablelgo=,go %endif -OPT_FLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -Wl,-z,relro,-z,now" +OPT_FLAGS="$OPT_FLAGS -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" -- Gitee From 90feda29968b982ca5be7ed56ce0aeda1d5c59e1 Mon Sep 17 00:00:00 2001 From: weiwei_150212 Date: Fri, 19 Mar 2021 14:51:01 +0800 Subject: [PATCH 03/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 1a5f8ab..ec9724c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -741,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" -- Gitee From 702ad4352e63f0f6cbaa5e490588f1bedd9a6bff Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 14:15:25 +0800 Subject: [PATCH 04/25] add SP and FS for x86 --- gcc.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/gcc.spec b/gcc.spec index ec9724c..574b7c0 100644 --- a/gcc.spec +++ b/gcc.spec @@ -695,6 +695,7 @@ cd ../.. #test don't build %if 1 CC=gcc +CFLAGS="${CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" 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'` -- Gitee From ce1b97b6ac4a6e9cc3a2af25fbc948640d7ec4d4 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 14:27:09 +0800 Subject: [PATCH 05/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 574b7c0..dbb9a8e 100644 --- a/gcc.spec +++ b/gcc.spec @@ -695,7 +695,7 @@ cd ../.. #test don't build %if 1 CC=gcc -CFLAGS="${CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" +CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" 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'` -- Gitee From 35df6185456623ba1339ca68e31d668e95b90bc5 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 14:49:21 +0800 Subject: [PATCH 06/25] add SP and FS for x86 --- gcc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcc.spec b/gcc.spec index dbb9a8e..8f84c08 100644 --- a/gcc.spec +++ b/gcc.spec @@ -597,7 +597,7 @@ chmod 755 split-debuginfo.sh %build - +CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" %ifarch aarch64_ilp32 optflags=`echo ${optflags}|sed -e 's/-mabi=ilp32//g'` optflags=`echo ${optflags}|sed -e 's/-Werror=format-security/ /g'` @@ -695,7 +695,6 @@ cd ../.. #test don't build %if 1 CC=gcc -CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" 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'` -- Gitee From d11af7ab4f08b92741d6a128fcef0b8e69adfe82 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 15:00:14 +0800 Subject: [PATCH 07/25] add SP and FS for x86 --- gcc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc.spec b/gcc.spec index 8f84c08..81e2997 100644 --- a/gcc.spec +++ b/gcc.spec @@ -597,7 +597,7 @@ chmod 755 split-debuginfo.sh %build -CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" + %ifarch aarch64_ilp32 optflags=`echo ${optflags}|sed -e 's/-mabi=ilp32//g'` optflags=`echo ${optflags}|sed -e 's/-Werror=format-security/ /g'` @@ -745,7 +745,7 @@ OPT_FLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE OPT_LDFLAGS="$OPT_LDFLAGS -Wl,-z,relro,-z,now" export extra_ldflags_libobjc="-Wl,-z,relro,-z,now" export FCFLAGS="$OPT_FLAGS" -CC="$CC" CFLAGS="$OPT_FLAGS" \ +CC="$CC" CFLAGS="$OPT_FLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" \ CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \ | sed 's/ -Werror=format-security //'`" \ LDFLAGS="$OPT_LDFLAGS" \ -- Gitee From 7996e0f9df6aa8b12d6eacec6e2f5637cb36a3b5 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 15:15:55 +0800 Subject: [PATCH 08/25] add SP and FS for x86 --- gcc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 81e2997..1815951 100644 --- a/gcc.spec +++ b/gcc.spec @@ -745,13 +745,14 @@ OPT_FLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE OPT_LDFLAGS="$OPT_LDFLAGS -Wl,-z,relro,-z,now" export extra_ldflags_libobjc="-Wl,-z,relro,-z,now" export FCFLAGS="$OPT_FLAGS" -CC="$CC" CFLAGS="$OPT_FLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" \ +CC="$CC" CFLAGS="$OPT_FLAGS" \ CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \ | sed 's/ -Werror=format-security //'`" \ LDFLAGS="$OPT_LDFLAGS" \ CFLAGS_FOR_TARGET="$OPT_FLAGS" \ CXXFLAGS_FOR_TARGET="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \ + CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" ../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --enable-shared --enable-threads=posix --enable-checking=release \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ -- Gitee From 6918ba97273537f9db7174bf6b4611a1c9fe2681 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 15:44:47 +0800 Subject: [PATCH 09/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 1815951..e8408bb 100644 --- a/gcc.spec +++ b/gcc.spec @@ -752,7 +752,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ CFLAGS_FOR_TARGET="$OPT_FLAGS" \ CXXFLAGS_FOR_TARGET="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \ - CFLAGS="$CFLAGS -param ggc-min-expand=20 -param ggc-min-heapsize=2048" + CFLAGS="$CFLAGS -param ggc-min-expand=0 -param ggc-min-heapsize=30720" ../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --enable-shared --enable-threads=posix --enable-checking=release \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ -- Gitee From 054ba227aac36d6305799530e9405f529bed8df0 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 15:47:30 +0800 Subject: [PATCH 10/25] add SP and FS for x86 --- gcc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index e8408bb..436e916 100644 --- a/gcc.spec +++ b/gcc.spec @@ -614,7 +614,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} ../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} -make -j100 +make -j16 export PATH=`pwd`${PATH:+:$PATH} cd ../../ %endif @@ -663,8 +663,8 @@ cd isl-build ../../isl-%{isl_version}/configure --disable-shared \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make -j100 -make -j100 install +make -j16 +make -j16 install cd .. mkdir cloog-build cloog-install @@ -685,8 +685,8 @@ cd - --prefix=`cd ..; pwd`/cloog-install sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make -j100 -make -j100 install +make -j16 +make -j16 install cd ../cloog-install/lib ln -sf libcloog-isl.so.4 libcloog-isl.so ln -sf libcloog-isl.so.4 libcloog.so -- Gitee From 71fd5198cc1dbaa05c936dfd5cf2cb7c05097164 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 16:25:05 +0800 Subject: [PATCH 11/25] add SP and FS for x86 --- gcc.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 436e916..ba3e3d5 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,9 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +../configure CFLAGS="%{optflags} -param ggc-min-expand=0 -param ggc-min-heapsize=30720" --prefix=%{_prefix} \ + --mandir=%{_mandir} --infodir=%{_infodir} + make -j16 export PATH=`pwd`${PATH:+:$PATH} cd ../../ -- Gitee From c4ad98b10408c7537edaee7a9b07523740de6494 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 17:02:15 +0800 Subject: [PATCH 12/25] add SP and FS for x86 --- gcc.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gcc.spec b/gcc.spec index ba3e3d5..0226e68 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags} -param ggc-min-expand=0 -param ggc-min-heapsize=30720" --prefix=%{_prefix} \ +../configure CFLAGS="%{optflags}" --prefix=%{_prefix} \ --mandir=%{_mandir} --infodir=%{_infodir} make -j16 @@ -698,6 +698,7 @@ cd ../.. %if 1 CC=gcc OPT_FLAGS=`echo %{optflags}|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'` +OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//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'` @@ -743,7 +744,7 @@ enablelada=,ada %if %{build_go} enablelgo=,go %endif -OPT_FLAGS="$OPT_FLAGS -O2 -Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong -fPIE -Wl,-z,relro,-z,now" +OPT_FLAGS="$OPT_FLAGS -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" @@ -754,7 +755,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ CFLAGS_FOR_TARGET="$OPT_FLAGS" \ CXXFLAGS_FOR_TARGET="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \ - CFLAGS="$CFLAGS -param ggc-min-expand=0 -param ggc-min-heapsize=30720" + ../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --enable-shared --enable-threads=posix --enable-checking=release \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ -- Gitee From 08c0cb476fcb8f6c30a9ed24d969a20aeeb8d78c Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 17:04:05 +0800 Subject: [PATCH 13/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 0226e68..c9a395e 100644 --- a/gcc.spec +++ b/gcc.spec @@ -697,8 +697,8 @@ cd ../.. #test don't build %if 1 CC=gcc -OPT_FLAGS=`echo %{optflags}|sed -e 's/-m64//g;s/-m32//g;s/-m31//g'` OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//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'` -- Gitee From cb9d2458b27645c533f59043eff3558a0eacc528 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 17:06:53 +0800 Subject: [PATCH 14/25] add SP and FS for x86 --- gcc.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index c9a395e..e0f646c 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,8 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags}" --prefix=%{_prefix} \ - --mandir=%{_mandir} --infodir=%{_infodir} +../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} make -j16 export PATH=`pwd`${PATH:+:$PATH} @@ -697,8 +696,8 @@ cd ../.. #test don't build %if 1 CC=gcc -OPT_FLAGS=`echo $OPT_FLAGS|sed -e 's/\(-Wp,\)\?-D_FORTIFY_SOURCE=[12]//g'` -OPT_FLAGS=`echo %{optflags}|sed -e 's/-m64//g;s/-m32//g;s/-m31//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 $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'` @@ -744,7 +743,7 @@ enablelada=,ada %if %{build_go} enablelgo=,go %endif -OPT_FLAGS="$OPT_FLAGS -fPIE -Wl,-z,relro,-z,now" +OPT_FLAGS="$OPT_FLAGS -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" -- Gitee From b71ebc34b8e530a5d1fe105b9973d66a7af070fc Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 17:14:26 +0800 Subject: [PATCH 15/25] add SP and FS for x86 --- gcc.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/gcc.spec b/gcc.spec index e0f646c..72ac76a 100644 --- a/gcc.spec +++ b/gcc.spec @@ -614,8 +614,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} ../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} - -make -j16 +make -j100 export PATH=`pwd`${PATH:+:$PATH} cd ../../ %endif @@ -664,8 +663,8 @@ cd isl-build ../../isl-%{isl_version}/configure --disable-shared \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make -j16 -make -j16 install +make -j100 +make -j100 install cd .. mkdir cloog-build cloog-install @@ -686,8 +685,8 @@ cd - --prefix=`cd ..; pwd`/cloog-install sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make -j16 -make -j16 install +make -j100 +make -j100 install cd ../cloog-install/lib ln -sf libcloog-isl.so.4 libcloog-isl.so ln -sf libcloog-isl.so.4 libcloog.so @@ -696,8 +695,8 @@ 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/\(-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 $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'` @@ -754,7 +753,6 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ CFLAGS_FOR_TARGET="$OPT_FLAGS" \ CXXFLAGS_FOR_TARGET="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \ - ../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --enable-shared --enable-threads=posix --enable-checking=release \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ -- Gitee From 424f50cba41cea74eb11168e65065bed41a91117 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 18:47:10 +0800 Subject: [PATCH 16/25] add SP and FS for x86 --- gcc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcc.spec b/gcc.spec index 72ac76a..1a5f8ab 100644 --- a/gcc.spec +++ b/gcc.spec @@ -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'` -- Gitee From 884a27e91c34c48a3ee268e8c5e8c6b33d52d332 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 19:52:45 +0800 Subject: [PATCH 17/25] add SP and FS for x86 --- gcc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 1a5f8ab..7064924 100644 --- a/gcc.spec +++ b/gcc.spec @@ -741,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" @@ -752,6 +752,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ CFLAGS_FOR_TARGET="$OPT_FLAGS" \ CXXFLAGS_FOR_TARGET="$OPT_FLAGS" \ XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \ + CFLAGS="$CFLAGS -param ggc-min-expand=0 -param ggc-min-heapsize=1024" ../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \ --enable-shared --enable-threads=posix --enable-checking=release \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ -- Gitee From a39a4861acd33ae4e2f12e9f96cdb2412ec82e89 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 20:29:27 +0800 Subject: [PATCH 18/25] add SP and FS for x86 --- gcc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index 7064924..fa81693 100644 --- a/gcc.spec +++ b/gcc.spec @@ -614,7 +614,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} ../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} -make -j100 +make -j16 export PATH=`pwd`${PATH:+:$PATH} cd ../../ %endif @@ -663,8 +663,8 @@ cd isl-build ../../isl-%{isl_version}/configure --disable-shared \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make -j100 -make -j100 install +make -j16 +make -j16 install cd .. mkdir cloog-build cloog-install @@ -685,8 +685,8 @@ cd - --prefix=`cd ..; pwd`/cloog-install sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make -j100 -make -j100 install +make -j16 +make -j16 install cd ../cloog-install/lib ln -sf libcloog-isl.so.4 libcloog-isl.so ln -sf libcloog-isl.so.4 libcloog.so -- Gitee From cf76467fa21b83da144229db3f77a004cd339d1f Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Mon, 22 Mar 2021 20:51:24 +0800 Subject: [PATCH 19/25] add SP and FS for x86 --- gcc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index fa81693..9324fd4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -614,7 +614,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} ../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} -make -j16 +make -j8 export PATH=`pwd`${PATH:+:$PATH} cd ../../ %endif @@ -663,8 +663,8 @@ cd isl-build ../../isl-%{isl_version}/configure --disable-shared \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make -j16 -make -j16 install +make -j8 +make -j8 install cd .. mkdir cloog-build cloog-install @@ -685,8 +685,8 @@ cd - --prefix=`cd ..; pwd`/cloog-install sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make -j16 -make -j16 install +make -j8 +make -j8 install cd ../cloog-install/lib ln -sf libcloog-isl.so.4 libcloog-isl.so ln -sf libcloog-isl.so.4 libcloog.so -- Gitee From a3a4c5d79ca161ced114c382bbfa7c5509293229 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Tue, 23 Mar 2021 09:50:58 +0800 Subject: [PATCH 20/25] add SP and FS for x86 --- gcc.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 9324fd4..3d71770 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,8 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} +../configure CFLAGS="%{optflags} -Xms1024m -Xmx1024m -Xmn2g -Xss128k" --prefix=%{_prefix} \ + --mandir=%{_mandir} --infodir=%{_infodir} make -j8 export PATH=`pwd`${PATH:+:$PATH} cd ../../ -- Gitee From 5dbb40c95678eab2ba70caee28c10bd75dc25694 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Tue, 23 Mar 2021 14:37:05 +0800 Subject: [PATCH 21/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index 3d71770..fe549a0 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags} -Xms1024m -Xmx1024m -Xmn2g -Xss128k" --prefix=%{_prefix} \ +../configure CFLAGS="%{optflags} -Xms2048m -Xmx2048m -Xmn2g -Xss128k" --prefix=%{_prefix} \ --mandir=%{_mandir} --infodir=%{_infodir} make -j8 export PATH=`pwd`${PATH:+:$PATH} -- Gitee From 1bade2775e32457af26dd6fbb82d01f0a2c593e4 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Tue, 23 Mar 2021 15:04:19 +0800 Subject: [PATCH 22/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index fe549a0..e8ad790 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags} -Xms2048m -Xmx2048m -Xmn2g -Xss128k" --prefix=%{_prefix} \ +../configure CFLAGS="%{optflags} -Xms30720m -Xmx30720m" --prefix=%{_prefix} \ --mandir=%{_mandir} --infodir=%{_infodir} make -j8 export PATH=`pwd`${PATH:+:$PATH} -- Gitee From 245e7658b4f0f67fc0f5ffb14b9bd78971449c70 Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Tue, 23 Mar 2021 15:28:25 +0800 Subject: [PATCH 23/25] add SP and FS for x86 --- gcc.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc.spec b/gcc.spec index e8ad790..4e56a06 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,7 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags} -Xms30720m -Xmx30720m" --prefix=%{_prefix} \ +../configure CFLAGS="%{optflags}" --prefix=%{_prefix} \ --mandir=%{_mandir} --infodir=%{_infodir} make -j8 export PATH=`pwd`${PATH:+:$PATH} -- Gitee From bf96a7ac994732f15f5db3d88294f8ea8f50b1bd Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Tue, 23 Mar 2021 16:06:24 +0800 Subject: [PATCH 24/25] add SP and FS for x86 --- gcc.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gcc.spec b/gcc.spec index 4e56a06..9324fd4 100644 --- a/gcc.spec +++ b/gcc.spec @@ -613,8 +613,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true # fastjar, build it anyway. mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} -../configure CFLAGS="%{optflags}" --prefix=%{_prefix} \ - --mandir=%{_mandir} --infodir=%{_infodir} +../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} make -j8 export PATH=`pwd`${PATH:+:$PATH} cd ../../ -- Gitee From ffa476738c7758aa4447639a3c83476784909f0a Mon Sep 17 00:00:00 2001 From: yeah_wang Date: Fri, 26 Mar 2021 10:02:04 +0800 Subject: [PATCH 25/25] add SP and FS for x86 --- gcc.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc.spec b/gcc.spec index 9324fd4..fa81693 100644 --- a/gcc.spec +++ b/gcc.spec @@ -614,7 +614,7 @@ export GCJ_PROPERTIES=jdt.compiler.useSingleThread=true mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform} ../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} -make -j8 +make -j16 export PATH=`pwd`${PATH:+:$PATH} cd ../../ %endif @@ -663,8 +663,8 @@ cd isl-build ../../isl-%{isl_version}/configure --disable-shared \ CC=/usr/bin/gcc CXX=/usr/bin/g++ \ CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC" --prefix=`cd ..; pwd`/isl-install -make -j8 -make -j8 install +make -j16 +make -j16 install cd .. mkdir cloog-build cloog-install @@ -685,8 +685,8 @@ cd - --prefix=`cd ..; pwd`/cloog-install sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make -j8 -make -j8 install +make -j16 +make -j16 install cd ../cloog-install/lib ln -sf libcloog-isl.so.4 libcloog-isl.so ln -sf libcloog-isl.so.4 libcloog.so -- Gitee