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