[Lldb-commits] [lldb] r208982 - Do not require the triple to be hard-coded

[Deepak Panickal]

Author: panickal
Date: Fri May 16 08:26:45 2014
New Revision: 208982

URL: http://llvm.org/viewvc/llvm-project?rev=208982&view=rev
Log:
Do not require the triple to be hard-coded

Modified:
    lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp
    lldb/trunk/tools/lldb-mi/MICmnConfig.h
    lldb/trunk/tools/lldb-mi/MIReadMe.txt

Modified: lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp?rev=208982&r1=208981&r2=208982&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp (original)
+++ lldb/trunk/tools/lldb-mi/MICmdCmdFile.cpp Fri May 16 08:26:45 2014
@@ -109,10 +109,9 @@ bool CMICmdCmdFileExecAndSymbols::Execut
 	const CMIUtilString & strExeFilePath( pArgFile->GetValue() );
 	CMICmnLLDBDebugSessionInfo & rSessionInfo( CMICmnLLDBDebugSessionInfo::Instance() );
 	lldb::SBDebugger & rDbgr = rSessionInfo.m_rLldbDebugger;
-														// Developer note:
-	lldb::SBError error;								// Arg options may need to be available here for the CreateTarget()
-	const char * pTargetTriple = MICONFIG_TRIPLE;		// Match the Arm executeable built for the target platform i.e. hello.elf
-	const char * pTargetPlatformName = "";				// This works for connecting to an Android development board
+	lldb::SBError error;                                                            
+	const char * pTargetTriple = nullptr;           // Let LLDB discover the triple required
+	const char * pTargetPlatformName = "";
 	const bool bAddDepModules = false;
 	lldb::SBTarget target = rDbgr.CreateTarget( strExeFilePath.c_str(), pTargetTriple, pTargetPlatformName, bAddDepModules, error );
 	CMIUtilString strWkDir;
@@ -128,6 +127,7 @@ bool CMICmdCmdFileExecAndSymbols::Execut
 	}
 	if( !rDbgr.SetCurrentPlatformSDKRoot( strWkDir.c_str() ) )
 	{
+
 		SetError( CMIUtilString::Format( MIRSRC( IDS_CMD_ERR_FNFAILED ), m_cmdData.strMiCmd.c_str(), "SetCurrentPlatformSDKRoot()" ) );
 		return MIstatus::failure;
 	}
@@ -178,4 +178,4 @@ bool CMICmdCmdFileExecAndSymbols::Acknow
 CMICmdBase * CMICmdCmdFileExecAndSymbols::CreateSelf( void )
 {
 	return new CMICmdCmdFileExecAndSymbols();
-}
\ No newline at end of file
+}

Modified: lldb/trunk/tools/lldb-mi/MICmnConfig.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MICmnConfig.h?rev=208982&r1=208981&r2=208982&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MICmnConfig.h (original)
+++ lldb/trunk/tools/lldb-mi/MICmnConfig.h Fri May 16 08:26:45 2014
@@ -28,6 +28,7 @@
 #define MICONFIG_DEBUG_SHOW_ATTACH_DBG_DLG 0
 
 // 1 = Compile in and init LLDB driver code alongside MI version, 0 = do not use
+// ToDo: This has not been fully implemented as may not be required in the future
 #define MICONFIG_COMPILE_MIDRIVER_WITH_LLDBDRIVER 0
 
 // 1 = Give runtime our own custom buffer, 0 = Use runtime managed buffer
@@ -40,8 +41,8 @@
 #define MICONFIG_POLL_FOR_STD_IN 1
 
 // Temp workaround while needing different triples
-// ToDo: This should be fixed to be figured out automatically
-#define MICONFIG_TRIPLE "arm"
+// ToDo: Temp workaround while needing different triples - not used ATM, may not be required anymore
+//#define MICONFIG_TRIPLE "arm"
 
 // 1 = Write to MI's Log file warnings about commands that did not handle arguments or
 // options present to them by the driver's client, 0 = no warnings given

Modified: lldb/trunk/tools/lldb-mi/MIReadMe.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/lldb-mi/MIReadMe.txt?rev=208982&r1=208981&r2=208982&view=diff
==============================================================================
--- lldb/trunk/tools/lldb-mi/MIReadMe.txt (original)
+++ lldb/trunk/tools/lldb-mi/MIReadMe.txt Fri May 16 08:26:45 2014
@@ -84,7 +84,8 @@ CMICmdCmdVarUpdate
 =========================================================================
 MI build configuration:
 MICmnConfig.h defines various preprocessor build options i.e. enable
-LLDB fall through should MI interpretor not recognise a command.
+LLDB fall through should MI interpretor not recognise a command (option
+not fully implemented - may be removed in the future).
 
 =========================================================================
 MI uses the following libraries: