Modifications to build correctly for different target CPUs. Specifically,