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