Don't merge this into -2.2 unless you understand the dependencies on c++rt0, bsd.lib.mk, and gcc -shared. I.e., let me do it.
