Improve GCC 4.8 intrinsics patch

Updated with patch attached to upstream bug report.