add TARGET_ARCH_VARIANT_CPU back