summaryrefslogtreecommitdiff
path: root/t/t9157-git-svn-fetch-merge.sh
diff options
context:
space:
mode:
authorLibravatar Victoria Dye <vdye@github.com>2021-11-04 04:01:03 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-11-03 23:12:10 -0700
commit4b540cf913b8f528fadb9357530a34ea0dc09737 (patch)
treeee1f638398aef016eb8c008cca3674cab53b875a /t/t9157-git-svn-fetch-merge.sh
parentrun-command: use thread-aware die_is_recursing routine (diff)
downloadtgif-4b540cf913b8f528fadb9357530a34ea0dc09737.tar.xz
async_die_is_recursing: work around GCC v11.x issue on Fedora
This fix corrects an issue found in the `dockerized(pedantic, fedora)` CI build, first appearing after the introduction of a new version of the Fedora docker image version. This image includes a version of `glibc` with the attribute `__attr_access_none` added to `pthread_setspecific` [1], the implementation of which only exists for GCC 11.X - the version included in the Fedora image. The attribute requires that the pointer provided in the second argument of `pthread_getspecific` must, if not NULL, be a pointer to a valid object. In the usage in `async_die_is_recursing`, `(void *)1` is not valid, causing the error. This fix imitates a workaround added in SELinux [2] by using the pointer to the static `async_die_counter` itself as the second argument to `pthread_setspecific`. This guaranteed non-NULL, valid pointer matches the intent of the current usage while not triggering the build error. [1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=a1561c3bbe8 [2] https://lore.kernel.org/all/20211021140519.6593-1-cgzones@googlemail.com/ Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Victoria Dye <vdye@github.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t9157-git-svn-fetch-merge.sh')
0 files changed, 0 insertions, 0 deletions