Add TARGET_CPU_VARIANT for newer trees