Replace TARGET_ARCH with MACHINE_ARCH which is reliably defined.
Replace TARGET_CPUTYPE with CPUTYPE which seems to be the expected
variable in sub-makes. I'm not sure this is sufficient. We may need to
set CPUTYPE from TARGET_CPUTYPE in Makefile.inc1..explicit TARGET_* variables with COMPAT_* versions defined based on where the file is being included.