This commit is contained in:
Jakub Jelinek 2022-01-27 10:21:55 +01:00
parent 828c757f09
commit a0c2c3b09e
5 changed files with 19 additions and 14 deletions

1
.gitignore vendored
View File

@ -55,3 +55,4 @@
/gcc-11.2.1-20211019.tar.xz
/gcc-11.2.1-20211203.tar.xz
/gcc-11.2.1-20220125.tar.xz
/gcc-11.2.1-20220127.tar.xz

View File

@ -1,10 +1,10 @@
%global DATE 20220125
%global gitrev 1003f94c7cb486aee2ec3ee37ea8b919f908f019
%global DATE 20220127
%global gitrev 2fa6e5c54e782377faa4c9c1f0e0b16db27f266c
%global gcc_version 11.2.1
%global gcc_major 11
# 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 8
%global gcc_release 9
%global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e
%global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0
%global _unpackaged_files_terminate_build 0
@ -3148,6 +3148,11 @@ end
%endif
%changelog
* Thu Jan 25 2022 Jakub Jelinek <jakub@redhat.com> 11.2.1-9
- update from releases/gcc-11-branch
- PRs fortran/104127, fortran/104212, fortran/104227, target/101529
- fix up va-opt-6.c testcase
* Tue Jan 25 2022 Jakub Jelinek <jakub@redhat.com> 11.2.1-8
- update from releases/gcc-11-branch
- PRs ada/103538, analyzer/101962, bootstrap/103688, c++/85846, c++/95009,

View File

@ -95,7 +95,7 @@ gcc/testsuite/
}
else if ((src->flags & PASTE_LEFT)
|| (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
@@ -2071,11 +2052,46 @@ replace_args (cpp_reader *pfile, cpp_has
@@ -2065,11 +2046,46 @@ replace_args (cpp_reader *pfile, cpp_has
{
unsigned int count
= start ? paste_flag - start : tokens_buff_count (buff);

View File

@ -178,11 +178,10 @@ gcc/testsuite/
}
else if ((src->flags & PASTE_LEFT)
|| (src != macro->exp.tokens && (src[-1].flags & PASTE_LEFT)))
@@ -2028,6 +2066,25 @@ replace_args (cpp_reader *pfile, cpp_has
is empty or because it is __VA_OPT__() ), drop PASTE_LEFT
flag from previous token. */
copy_paste_flag (pfile, start, &pfile->avoid_paste);
+
@@ -2023,6 +2061,24 @@ replace_args (cpp_reader *pfile, cpp_has
paste_flag = tokens_buff_last_token_ptr (buff);
}
+ if (vaopt_tracker.stringify ())
+ {
+ unsigned int count
@ -201,10 +200,10 @@ gcc/testsuite/
+ NULL, 0);
+ continue;
+ }
if (src->flags & PASTE_LEFT)
{
/* With a non-empty __VA_OPT__ on the LHS of ##, the last
@@ -3584,7 +3641,10 @@ create_iso_definition (cpp_reader *pfile
if (start && paste_flag == start && (*start)->flags & PASTE_LEFT)
/* If __VA_OPT__ expands to nothing (either because __VA_ARGS__
is empty or because it is __VA_OPT__() ), drop PASTE_LEFT
@@ -3584,7 +3640,10 @@ create_iso_definition (cpp_reader *pfile
function-like macros when lexing the subsequent token. */
if (macro->count > 1 && token[-1].type == CPP_HASH && macro->fun_like)
{

View File

@ -1,4 +1,4 @@
SHA512 (gcc-11.2.1-20220125.tar.xz) = f2670bce2f207e3353c30be9f1108499b91f27bce9182f1cec3a73a754f248886a6e6e4b40c5968b74fd4409604780c9ad78b92677c27521d82f31b5b38ad269
SHA512 (gcc-11.2.1-20220127.tar.xz) = da9fa3122aa15ad647e07fac27e8c59de74fa04f1846074320751f6fbfa30ac239867b6c349c4d0c08ada01722e6074a89809dd89c3e189fefdfcf16fad70498
SHA512 (isl-0.18.tar.bz2) = 85d0b40f4dbf14cb99d17aa07048cdcab2dc3eb527d2fbb1e84c41b2de5f351025370e57448b63b2b8a8cf8a0843a089c3263f9baee1542d5c2e1cb37ed39d94
SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 002a48a7b689a81abbf16161bcaec001a842e67dfbe372e9e109092703bfc666675f16198f60ca429370e8850d564547dc505df81bc3aaca4ce6defbc014ad6c
SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7