Import LLDB as of upstream SVN r216948 (git 50f7fe44)

This corresponds with the branchpoint for the 3.5 release.
A number of files not required for the FreeBSD build have been removed.

Sponsored by:	DARPA, AFRL

1 files changed, 7 insertions, 3 deletions

diff --git a/source/Interpreter/OptionGroupOutputFile.cpp b/source/Interpreter/OptionGroupOutputFile.cpp
index 3bb8ab3..ec9e166 100644
--- a/source/Interpreter/OptionGroupOutputFile.cpp
+++ b/source/Interpreter/OptionGroupOutputFile.cpp
@@ -28,11 +28,15 @@ OptionGroupOutputFile::~OptionGroupOutputFile ()
 {
 }
 
+static const uint32_t SHORT_OPTION_APND = 0x61706e64;   // 'apnd'
+
 static OptionDefinition
 g_option_table[] =
 {
-    { LLDB_OPT_SET_1 , false, "outfile", 'o', OptionParser::eRequiredArgument, NULL, 0, eArgTypeFilename , "Specify a path for capturing command output."},
-    { LLDB_OPT_SET_1 , false, "append-outfile" , 'apnd', OptionParser::eNoArgument, NULL, 0, eArgTypeNone , "Append to the the file specified with '--outfile <path>'."},
+    { LLDB_OPT_SET_1 , false, "outfile", 'o', OptionParser::eRequiredArgument, nullptr, nullptr, 0, eArgTypeFilename , "Specify a path for capturing command output."},
+    { LLDB_OPT_SET_1 , false, "append-outfile" , SHORT_OPTION_APND,
+      OptionParser::eNoArgument, nullptr, nullptr, 0, eArgTypeNone ,
+      "Append to the the file specified with '--outfile <path>'."},
 };
 
 uint32_t
@@ -61,7 +65,7 @@ OptionGroupOutputFile::SetOptionValue (CommandInterpreter &interpreter,
             error = m_file.SetValueFromCString (option_arg);
             break;
 
-        case 'apnd':
+        case SHORT_OPTION_APND:
             m_append.SetCurrentValue(true);
             break;