cfi: use safer arch detection