Bring patch correction over from gcc repository.