Change name of detection macros to be generic arm (not armv6)