Better support for new archs.
Merge pull request #7079 from xsacha/new_archs

Better support for new archs.