Merging symbols files, handling the arch differences inline instead

No match.