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