Applied the following patches from the upstream hwloc 1.9 branch after
the v1.9.1 release: