(cherry picked from commit open-mpi/hwloc@ae82597773) Signed-off-by: Jeff Squyres <jsquyres@cisco.com>