Grr...actually apply the diff to the port.

I reviewed the code, but simply copied over the file. Actually
apply the diff to create a usable patch to fix the -fno-common
issue.