Rather than having arch specific code in Makefile.inc1, generalize so that we can control the settings of different options on a per architecutre basis. Reviewed by: arch@ (twice)
