rpms/gcc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

12.1.1-3

Browse Source
This commit is contained in:
Jakub Jelinek 2022-06-30 10:33:33 +02:00
parent b2315f360e
commit 245908f188
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc.spec
View File

@ -1,10 +1,10 @@
%global DATE 20220628 %global DATE 20220630
%global gitrev 874cb9452c56f1c3b3a7b5bfed93a262504b9856 %global gitrev 874cb9452c56f1c3b3a7b5bfed93a262504b9856
%global gcc_version 12.1.1 %global gcc_version 12.1.1
%global gcc_major 12 %global gcc_major 12
# Note, gcc_release must be integer, if you want to add suffixes to # Note, gcc_release must be integer, if you want to add suffixes to
# %%{release}, append them after %%{gcc_release} on Release: line. # %%{release}, append them after %%{gcc_release} on Release: line.
%global gcc_release 2 %global gcc_release 3
%global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e %global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e
%global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0 %global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0
%global _unpackaged_files_terminate_build 0 %global _unpackaged_files_terminate_build 0
@ -276,6 +276,7 @@ Patch9: gcc12-Wno-format-security.patch
Patch10: gcc12-rh1574936.patch Patch10: gcc12-rh1574936.patch
Patch11: gcc12-d-shared-libphobos.patch Patch11: gcc12-d-shared-libphobos.patch
Patch12: gcc12-pr105551.patch Patch12: gcc12-pr105551.patch
Patch13: gcc12-libtsan-s390x.patch
Patch100: gcc12-fortran-fdec-duplicates.patch Patch100: gcc12-fortran-fdec-duplicates.patch
Patch101: gcc12-fortran-flogical-as-integer.patch Patch101: gcc12-fortran-flogical-as-integer.patch
@ -804,6 +805,7 @@ so that there cannot be any synchronization problems.
%endif %endif
%patch11 -p0 -b .d-shared-libphobos~ %patch11 -p0 -b .d-shared-libphobos~
%patch12 -p0 -b .pr105551~ %patch12 -p0 -b .pr105551~
%patch13 -p0 -b .libtsan-s390x~
%if 0%{?rhel} >= 9 %if 0%{?rhel} >= 9
%patch100 -p1 -b .fortran-fdec-duplicates~ %patch100 -p1 -b .fortran-fdec-duplicates~
@ -3215,6 +3217,9 @@ end
%endif %endif
%changelog %changelog
* Thu Jun 30 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-3
- fix up libtsan on s390x
* Tue Jun 28 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-2 * Tue Jun 28 2022 Jakub Jelinek <jakub@redhat.com> 12.1.1-2
- update from releases/gcc-12 branch - update from releases/gcc-12 branch
- PRs c++/49387, c++/102307, c++/102651, c++/104470, c++/105491, c++/105589, - PRs c++/49387, c++/102307, c++/102651, c++/104470, c++/105491, c++/105589,

17
gcc12-libtsan-s390x.patch Normal file
View File

@ -0,0 +1,17 @@
commit r12-8527-g7811663964aa7e31c3939b859bbfa2e16919639f
Author: Martin Liska <mliska@suse.cz>
Date: Wed Jun 29 15:28:07 2022 +0200
libsanitizer: cherry-pick 791e0d1bc85d
791e0d1bc85d: [compiler-rt] Add NO_EXEC_STACK_DIRECTIVE on s390x
(cherry picked from commit aa87b7541b4c11f59c521154513f844ea6b5c977)
--- libsanitizer/tsan/tsan_rtl_s390x.S
+++ libsanitizer/tsan/tsan_rtl_s390x.S
@@ -45,3 +45,5 @@ intercept setjmp, _ZN14__interception11real_setjmpE
intercept _setjmp, _ZN14__interception12real__setjmpE
intercept sigsetjmp, _ZN14__interception14real_sigsetjmpE
intercept __sigsetjmp, _ZN14__interception16real___sigsetjmpE
+
+NO_EXEC_STACK_DIRECTIVE