Update the command line here and update the comment, we're just going

to leave this as a debug only option for now.

llvm-svn: 149890

2 files changed, 4 insertions, 3 deletions

diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index bab7568736d..5815fda754e 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -868,9 +868,8 @@ void Driver::BuildUniversalActions(const ToolChain &TC,
 
         Actions.push_back(new DsymutilJobAction(Inputs, types::TY_dSYM));
 
-	// Verify the debug output if we're in assert mode.
-	// TODO: The verifier is noisy by default so put this under an
-	// option for now.
+        // Verify the debug information if we're in debug mode and '-verify'
+        // is passed.
 	#ifndef NDEBUG
 	if (Args.hasArg(options::OPT_verify)) {
 	  ActionList VerifyInputs;
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 5c88468b296..0b713c111b0 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -4079,6 +4079,8 @@ void darwin::VerifyDebug::ConstructJob(Compilation &C, const JobAction &JA,
 				       const char *LinkingOutput) const {
   ArgStringList CmdArgs;
   CmdArgs.push_back("--verify");
+  CmdArgs.push_back("--debug-info");
+  CmdArgs.push_back("--eh-frame");
 
   assert(Inputs.size() == 1 && "Unable to handle multiple inputs.");
   const InputInfo &Input = Inputs[0];