Recognize either / or - as a machine/suptype separator from uname -m
to cope with older systems that have the older uname.

From-SVN: r14026