Added guards around CPU_SUBTYPE_ARM_V7S