Revert back to GCC_TARGET_MACHINE.
Merge branch 'joyent/feature/multiarch/trunk' into joyent/release/trunk
Merge branch 'joyent/release/trunk' into joyent/release/trunk_sngl