I thought the gcc patch from upstream would apply straight. False, push-happy.
I took the gcc commit as reference.
http://hydra.nixos.org/build/3046633