I would go to him first and just say "you know some times you just cross the line with your comments. " I always ask my employees to come to me if I do some thing to upset them. and as a co worker I want them to tell me if I do something to upset them. If this guy doesn't react positively, well you have no choice but to go to the boss. But girl document every incident.