Index: lib/Support/CommandLine.cpp
===================================================================
--- lib/Support/CommandLine.cpp
+++ lib/Support/CommandLine.cpp
@@ -1676,9 +1676,13 @@
     Option::printHelpStr(O.HelpStr, GlobalWidth, O.ArgStr.size() + 6);
 
     for (unsigned i = 0, e = getNumOptions(); i != e; ++i) {
+      if(getOption(i).empty() && getDescription(i).empty())
+        continue;
       size_t NumSpaces = GlobalWidth - getOption(i).size() - 8;
       outs() << "    =" << getOption(i);
-      outs().indent(NumSpaces) << " -   " << getDescription(i) << '\n';
+      if (!getDescription(i).empty())
+        outs().indent(NumSpaces) << " -   " << getDescription(i);
+      outs() << '\n';
     }
   } else {
     if (!O.HelpStr.empty())