diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index ed6d0b7..dd99c09 100644
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -83,8 +83,8 @@
     Res.push_back("-analyzer-display-progress");
   if (Opts.EagerlyAssume)
     Res.push_back("-analyzer-eagerly-assume");
-  if (Opts.PurgeDead)
-    Res.push_back("-analyzer-purge-dead");
+  if (!Opts.PurgeDead)
+    Res.push_back("-analyzer-no-purge-dead");
   if (Opts.TrimGraph)
     Res.push_back("-trim-egraph");
   if (Opts.VisualizeEGDot)
@@ -238,7 +238,7 @@
 static void FrontendOptsToArgs(const FrontendOptions &Opts,
                                std::vector<std::string> &Res) {
   if (!Opts.DebugCodeCompletionPrinter)
-    Res.push_back("-code-completion-debug-printer=0");
+    Res.push_back("-no-code-completion-debug-printer");
   if (Opts.DisableFree)
     Res.push_back("-disable-free");
   if (Opts.EmptyInputOnly)
@@ -394,8 +394,8 @@
     Res.push_back("-faltivec");
   Res.push_back("-fexceptions");
   Res.push_back(Opts.Exceptions ? "1" : "0");
-  Res.push_back("-frtti");
-  Res.push_back(Opts.Rtti ? "1" : "0");
+  if (!Opts.Rtti)
+    Res.push_back("-fno-rtti");
   if (!Opts.NeXTRuntime)
     Res.push_back("-fgnu-runtime");
   if (Opts.Freestanding)
@@ -411,7 +411,7 @@
   if (Opts.EmitAllDecls)
     Res.push_back("-femit-all-decls");
   if (!Opts.MathErrno)
-    Res.push_back("-fmath-errno=0");
+    Res.push_back("-fno-math-errno");
   if (Opts.OverflowChecking)
     Res.push_back("-ftrapv");
   if (Opts.HeinousExtensions)