solaris-chiptype: fix warning about renaming occuring too late

See https://github.com/open-mpi/hwloc/pull/1
with further simplify/uniformify from me.
Thanks to Gilles Gouaillardet

(cherry picked from commit 119a5188025f9dbb7d3d4f9db52da6cb94f40ac4)