Index: lib/Frontend/CompilerInvocation.cpp
===================================================================
--- lib/Frontend/CompilerInvocation.cpp	(revision 129633)
+++ lib/Frontend/CompilerInvocation.cpp	(working copy)
@@ -1363,7 +1363,8 @@
   Opts.Bool = Opts.OpenCL || Opts.CPlusPlus;
 
   Opts.GNUKeywords = Opts.GNUMode;
-  Opts.CXXOperatorNames = Opts.CPlusPlus;
+  if (Opts.CPlusPlus)
+    Opts.CXXOperatorNames = 1;
 
   // Mimicing gcc's behavior, trigraphs are only enabled if -trigraphs
   // is specified, or -std is set to a conforming mode.