(This was support to be with 6 other ports but I forgot to "svn add" the patch) Approved by: gcc5 support blanket