Restore TARGET_ARCH_VARIANT_FPU handling

Change-Id: Ifbafddaa1f5d05307a704ee4e570c5b5571fef1d