This is most of a fix for bug #7549.  I still need to make it be the default if the arch isn't known.
This fixes #7549.