Make linux32 ... on x86-64 to do proper uname emulation again.

Also changes i386 to i686 because that's more near the truth.