Skip to content

[Backport staging-22.05] glibc: apply pending PR29162 to unbreak gnat6#174177

Merged
vcunat merged 1 commit intostaging-22.05from
backport-173893-to-staging-22.05
May 23, 2022
Merged

[Backport staging-22.05] glibc: apply pending PR29162 to unbreak gnat6#174177
vcunat merged 1 commit intostaging-22.05from
backport-173893-to-staging-22.05

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented May 23, 2022

Bot-based backport to staging-22.05, triggered by a label in #173893.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

commit e938c0274 "Don't add access size hints to fortifiable functions"
converted a few '__attr_access ((...))' into '__fortified_attr_access (...)'
calls.

But one of conversions had double parentheses of '__fortified_attr_access (...)'.

Noticed as a gnat6 build failure:

    /<<NIX>>-glibc-2.34-210-dev/include/bits/string_fortified.h:110:50: error: macro "__fortified_attr_access" requires 3 arguments, but only 1 given

The change fixes parentheses.

(cherry picked from commit 3c211fb)
@github-actions github-actions bot requested review from Ma27 and edolstra May 23, 2022 20:06
@vcunat vcunat merged commit c489a12 into staging-22.05 May 23, 2022
@vcunat vcunat deleted the backport-173893-to-staging-22.05 branch May 23, 2022 20:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants