Cherry-pick patch to fix build with glibc 2.36

Jeremy Bícharequested to merge
glibc-fix into master

Closes: https://bugs.debian.org/1020431

Edited by Jeremy Bícha

Merge request reports