Move cs_option dispatch into arch specific
5 files changed