backport hurd fixes

Samuel Thibaultrequested to merge
sthibault/llvm-toolchain:15 into 15

These are already in ≥ 16

Merge request reports