Added lost TARGET_CPU_VARIANT and fix undeclared variable