Update conditionals so this does the right thing on Solaris/x86 so

that the correct object files are dumped and so that we can link them
all together.

However, the resulting exectable does not work on Solaris/x86.