Merge lldb-platform and lldb-gdbserver into a single binary.

[flackr]

Summary

This commit merges lldb-platform and lldb-gdbserver into a single binary of the same size as each of the previous individual binaries. Execution mode is controlled by the first argument being either platform or gdbserver.

[silvas]

Can you maybe use the trick of looking at argv[0] instead of taking a command line option to know which program to be? (assuming it makes sense to do this change). See llvm-ar for an example.

[emaste]

In D7545#121674, @silvas wrote:

Can you maybe use the trick of looking at argv[0] instead of taking a command line option to know which program to be? (assuming it makes sense to do this change). See llvm-ar for an example.

Or look at lld as a good example. It chooses appropriate behaviour based on argv[0] but also has a -flavor argument for use when argv[0] does not match any of the known names.

% ./lld
Select the appropriate flavor
OVERVIEW: LLVM Linker

USAGE: lld [options] <inputs>

OPTIONS:
...
  -flavor <value> Flavor for linking, options are gnu/darwin/link


% ln -s lld ld
% ./ld
No input files

[vharron]

argv[0] would be more standard but requires a symlink on the target. This
just requires the binary.

[vharron]

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

493 ↗

(On Diff #19708)

I actually don't like lldb being removed from lldb-gdbserver. Then you just have something that doesn't make sense, because it isn't gdbserver. I think we should stick with lldb-gdbserver and also lldb-platform to differentiate the platform process from the platform command/concept.

[tberghammer]

Please rebase it TOT as a big refactor was committed in what will conflict with this patch.

I would prefer to keep the source code for lldb-platform and lldb-gdbserver in two different cpp file and make lldb-server contain only a main method to distinguish between the two, but I am not sure how much code duplication it will cause.

[vharron]

I would prefer to keep the source code for lldb-platform and

lldb-gdbserver in two different cpp file

I was thinking the same thing but I'll speak up now that Thomas has
spoken.

[flackr]

Keep lldb-platform.cpp and lldb-gdbserver.cpp separate but link and call into them from lldb-server.cpp. Also merges changes from ToT.

[flackr]

I've kept the two in separate cpp files with a new cpp file for lldb-server which calls the main on one or the other.

source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServer.cpp

493 ↗

(On Diff #19708)

Undone.

[tberghammer]

Please update the project files for the xcode project.

tools/lldb-server/lldb-gdbserver.cpp

57–58 ↗

(On Diff #19783)

Please make the functions and the global variables static instead of using an anonymous namespace.

tools/lldb-server/lldb-platform.cpp

42–43 ↗

(On Diff #19783)

Please make the functions and the global variables static instead of using an anonymous namespace.

[flackr]

• Fixed the gdbserver test helper and verified no more test failures introduced by change.
• Addressed review comments

I've verified the build on windows. It still does not build lldb-platform
Still working on getting mac to use to update the xcodeproj files.

[flackr]

I'll update as soon as I get a mac to test on.

tools/lldb-server/lldb-gdbserver.cpp

57–58 ↗

(On Diff #19783)

Done.

tools/lldb-server/lldb-platform.cpp

42–43 ↗

(On Diff #19783)

Done.

[tberghammer]

LGTM

[flackr]

Updated xcode project and verified building and running lldb-server on OSX.

[flackr]

I've tested build on Windows, Linux, OSX and running on Linux and OSX (lldb-server is not built on Windows), if this is good can you land for me? I still don't have commit access. Thanks.

[vharron]

Hi Tamas/Robert,

We definitely need input from someone on the Apple side for CLs that affect them. UUIC, Apple is using lldb-platform.

[flackr]

In D7545#125681, @vharron wrote:

Hi Tamas/Robert,

We definitely need input from someone on the Apple side for CLs that affect them. UUIC, Apple is using lldb-platform.

Sorry, I hadn't realized that. Should we revert and continue review? It landed as svn revision 229683 and 229691 (One of the tools taking diffs stripped deleting / adding empty files).

[vharron]

Let's wait for Greg to chime in.

[ovyalov]

Could you rename test/tools/lldb-gdbserver to test/tools/lldb-server as well?

lldb/trunk/lldb.xcodeproj/project.pbxproj

/* Begin PBXBuildFile section */
     23F4034D1926E0F60046DC9B /* NativeRegisterContextRegisterInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 23F403481926CC250046DC9B /* NativeRegisterContextRegisterInfo.cpp */; };
     25420ECD1A6490B8009ADBCB /* OptionValueChar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25420ECC1A6490B8009ADBCB /* OptionValueChar.cpp */; };
     25420ED21A649D88009ADBCB /* PipeBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25420ED11A649D88009ADBCB /* PipeBase.cpp */; };
     254FBB951A81AA7F00BD6378 /* SBLaunchInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 254FBB941A81AA7F00BD6378 /* SBLaunchInfo.cpp */; };
     254FBB971A81B03100BD6378 /* SBLaunchInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 254FBB961A81B03100BD6378 /* SBLaunchInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
     254FBBA31A9166F100BD6378 /* SBAttachInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 254FBBA21A9166F100BD6378 /* SBAttachInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
     254FBBA51A91670E00BD6378 /* SBAttachInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 254FBBA41A91670E00BD6378 /* SBAttachInfo.cpp */; };
     260157C61885F51C00F875CF /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
-    260157C71885F52500F875CF /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
     260157C81885F53100F875CF /* libpanel.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 260157C41885F4FF00F875CF /* libpanel.dylib */; };
-    2606EDDE184E68940034641B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 260C876910F538E700BB2B04 /* Foundation.framework */; };
     2606EDDF184E68A10034641B /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
     260A248E15D06C50009981B0 /* OptionValues.h in Headers */ = {isa = PBXBuildFile; fileRef = 260A248D15D06C4F009981B0 /* OptionValues.h */; };
     260A39A619647A3A004B4130 /* Pipe.h in Headers */ = {isa = PBXBuildFile; fileRef = 260A39A519647A3A004B4130 /* Pipe.h */; };
     260A63171861008E00FECF8E /* IOHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 260A63161861008E00FECF8E /* IOHandler.h */; };
     260A63191861009E00FECF8E /* IOHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 260A63181861009E00FECF8E /* IOHandler.cpp */; };
     260CC62E15D04377002BF2E0 /* OptionValueArgs.h in Headers */ = {isa = PBXBuildFile; fileRef = 260CC62115D04377002BF2E0 /* OptionValueArgs.h */; };
     260CC62F15D04377002BF2E0 /* OptionValueArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 260CC62215D04377002BF2E0 /* OptionValueArray.h */; };
     260CC63015D04377002BF2E0 /* OptionValueBoolean.h in Headers */ = {isa = PBXBuildFile; fileRef = 260CC62315D04377002BF2E0 /* OptionValueBoolean.h */; };
/* Begin PBXBuildFile section */
     2669424C1A6DC2AC0063BE93 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266941FC1A6DC2AC0063BE93 /* Platform.cpp */; };
     2669424D1A6DC32B0063BE93 /* LLDB.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 26680207115FD0ED008E1FE4 /* LLDB.framework */; };
     266DFE9713FD656E00D0C574 /* OperatingSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 266DFE9613FD656E00D0C574 /* OperatingSystem.cpp */; };
     2670F8121862B44A006B332C /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
     2671A0D013482601003A87BB /* ConnectionMachPort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2671A0CF13482601003A87BB /* ConnectionMachPort.cpp */; };
     26744EF11338317700EF765A /* GDBRemoteCommunicationClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EED1338317700EF765A /* GDBRemoteCommunicationClient.cpp */; };
     26744EF31338317700EF765A /* GDBRemoteCommunicationServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26744EEF1338317700EF765A /* GDBRemoteCommunicationServer.cpp */; };
     26780C611867C33D00234593 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
-    26780C651867C34500234593 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 2670F8111862B44A006B332C /* libncurses.dylib */; };
     267C012B136880DF006E963E /* OptionGroupValueObjectDisplay.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 267C012A136880DF006E963E /* OptionGroupValueObjectDisplay.cpp */; };
     267C01371368C49C006E963E /* OptionGroupOutputFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26BCFC531368B3E4006DC050 /* OptionGroupOutputFile.cpp */; };
     268648C416531BF800F04704 /* com.apple.debugserver.posix.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 268648C116531BF800F04704 /* com.apple.debugserver.posix.plist */; };
     268648C516531BF800F04704 /* com.apple.debugserver.applist.internal.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 268648C216531BF800F04704 /* com.apple.debugserver.applist.internal.plist */; };
     268648C616531BF800F04704 /* com.apple.debugserver.internal.plist in CopyFiles */ = {isa = PBXBuildFile; fileRef = 268648C316531BF800F04704 /* com.apple.debugserver.internal.plist */; };
     2686536C1370ACB200D186A3 /* OptionGroupBoolean.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2686536B1370ACB200D186A3 /* OptionGroupBoolean.cpp */; };
     268653701370AE7200D186A3 /* OptionGroupUInt64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2686536F1370AE7200D186A3 /* OptionGroupUInt64.cpp */; };
     2689000113353DB600698AC0 /* BreakpointResolverAddress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D0DD5310FE555900271C65 /* BreakpointResolverAddress.cpp */; };
/* Begin PBXBuildFile section */
     26C72C961243229A0068DC16 /* SBStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26C72C951243229A0068DC16 /* SBStream.cpp */; };
     26CA97A1172B1FD5005DC71B /* RegisterContextThreadMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26CA979F172B1FD5005DC71B /* RegisterContextThreadMemory.cpp */; };
     26CA97A2172B1FD5005DC71B /* RegisterContextThreadMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CA97A0172B1FD5005DC71B /* RegisterContextThreadMemory.h */; };
     26CEB5EF18761CB2008F575A /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32A10F3DFDD009D5894 /* libedit.dylib */; };
     26CEB5F218762056008F575A /* CommandObjectGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26CEB5F018762056008F575A /* CommandObjectGUI.cpp */; };
     26CEB5F318762056008F575A /* CommandObjectGUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CEB5F118762056008F575A /* CommandObjectGUI.h */; };
     26CFDCA11861638D000E63E5 /* Editline.h in Headers */ = {isa = PBXBuildFile; fileRef = 26CFDCA01861638D000E63E5 /* Editline.h */; };
     26CFDCA3186163A4000E63E5 /* Editline.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26CFDCA2186163A4000E63E5 /* Editline.cpp */; };
-    26CFDCA71861646C000E63E5 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32A10F3DFDD009D5894 /* libedit.dylib */; };
     26CFDCA818616473000E63E5 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26F5C32A10F3DFDD009D5894 /* libedit.dylib */; };
     26D1803E16CEBFD300EDFB5B /* KQueue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D1803C16CEBFD300EDFB5B /* KQueue.cpp */; };
     26D1804216CEDF0700EDFB5B /* TimeSpecTimeout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D1804016CEDF0700EDFB5B /* TimeSpecTimeout.cpp */; };
     26D1804516CEE12500EDFB5B /* KQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 26D1804416CEE12500EDFB5B /* KQueue.h */; };
     26D1804716CEE12C00EDFB5B /* TimeSpecTimeout.h in Headers */ = {isa = PBXBuildFile; fileRef = 26D1804616CEE12C00EDFB5B /* TimeSpecTimeout.h */; };
     26D265A2136B40EE002EEE45 /* SharingPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 261B5A5311C3F2AD00AABD0A /* SharingPtr.h */; settings = {ATTRIBUTES = (Public, ); }; };
     26D265BC136B4269002EEE45 /* lldb-public.h in Headers */ = {isa = PBXBuildFile; fileRef = 26651A14133BEC76005B64B7 /* lldb-public.h */; settings = {ATTRIBUTES = (Public, ); }; };
     26D55235159A7DB100708D8D /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 26D55234159A7DB100708D8D /* libxml2.dylib */; };
     26D5E15F135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */; };
     26D5E163135BB054006EA0A7 /* OptionGroupPlatform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */; };
-    26D6F3F6183E7F9300194858 /* lldb-gdbserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */; };
-    26D6F3FA183E888800194858 /* liblldb-core.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2689FFCA13353D7A00698AC0 /* liblldb-core.a */; };
     26D7E45D13D5E30A007FD12B /* SocketAddress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D7E45C13D5E30A007FD12B /* SocketAddress.cpp */; };
     26DAED6015D327A200E15819 /* OptionValuePathMappings.h in Headers */ = {isa = PBXBuildFile; fileRef = 26DAED5F15D327A200E15819 /* OptionValuePathMappings.h */; };
     26DAED6315D327C200E15819 /* OptionValuePathMappings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DAED6215D327C200E15819 /* OptionValuePathMappings.cpp */; };
     26DB3E161379E7AD0080DC73 /* ABIMacOSX_arm.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DB3E071379E7AD0080DC73 /* ABIMacOSX_arm.cpp */; };
     26DB3E191379E7AD0080DC73 /* ABIMacOSX_arm64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DB3E0B1379E7AD0080DC73 /* ABIMacOSX_arm64.cpp */; };
     26DB3E1C1379E7AD0080DC73 /* ABIMacOSX_i386.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DB3E0F1379E7AD0080DC73 /* ABIMacOSX_i386.cpp */; };
     26DB3E1F1379E7AD0080DC73 /* ABISysV_x86_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DB3E131379E7AD0080DC73 /* ABISysV_x86_64.cpp */; };
     26DC6A1D1337FECA00FF7998 /* lldb-platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */; };
/* Begin PBXBuildFile section */
     94CD705216F8F5BC00CF1E42 /* LibCxxMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94CD705116F8F5BC00CF1E42 /* LibCxxMap.cpp */; };
     94CD7D0919A3FBA300908B7C /* AppleObjCClassDescriptorV2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94CD7D0819A3FBA300908B7C /* AppleObjCClassDescriptorV2.cpp */; };
     94CD7D0C19A3FBCE00908B7C /* AppleObjCTypeEncodingParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94CD7D0B19A3FBCE00908B7C /* AppleObjCTypeEncodingParser.cpp */; };
     94D0B10C16D5535900EA9C70 /* LibCxx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D0B10A16D5535900EA9C70 /* LibCxx.cpp */; };
     94D0B10D16D5535900EA9C70 /* LibStdcpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D0B10B16D5535900EA9C70 /* LibStdcpp.cpp */; };
     94D6A0AA16CEB55F00833B6E /* NSArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D6A0A716CEB55F00833B6E /* NSArray.cpp */; };
     94D6A0AB16CEB55F00833B6E /* NSDictionary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D6A0A816CEB55F00833B6E /* NSDictionary.cpp */; };
     94D6A0AC16CEB55F00833B6E /* NSSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94D6A0A916CEB55F00833B6E /* NSSet.cpp */; };
-    94E829CA152D33C1006F96A3 /* lldb-platform in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-platform */; };
+    94E829CA152D33C1006F96A3 /* lldb-server in Resources */ = {isa = PBXBuildFile; fileRef = 26DC6A101337FE6900FF7998 /* lldb-server */; };
     94EA1D5C15E6C9B400D4171A /* PythonDataObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94EA1D5B15E6C9B400D4171A /* PythonDataObjects.cpp */; };
     94EA27CE17DE91750070F505 /* LibCxxUnorderedMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94EA27CD17DE91750070F505 /* LibCxxUnorderedMap.cpp */; };
     94F48F251A01C687005C0EC6 /* StringPrinter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94F48F241A01C687005C0EC6 /* StringPrinter.cpp */; };
     94FA3DE01405D50400833217 /* ValueObjectConstResultChild.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 94FA3DDF1405D50300833217 /* ValueObjectConstResultChild.cpp */; };
     964463EC1A330C0500154ED8 /* CompactUnwindInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 964463EB1A330C0500154ED8 /* CompactUnwindInfo.cpp */; };
     964463EE1A330C1B00154ED8 /* CompactUnwindInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 964463ED1A330C1B00154ED8 /* CompactUnwindInfo.h */; };
     966C6B7918E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
     966C6B7A18E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
-    966C6B7B18E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
     966C6B7C18E6A56A0093F5EC /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 966C6B7818E6A56A0093F5EC /* libz.dylib */; };
     9A19A6AF1163BBB200E0D453 /* SBValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A19A6A51163BB7E00E0D453 /* SBValue.h */; settings = {ATTRIBUTES = (Public, ); }; };
     9A19A6B01163BBB300E0D453 /* SBValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A19A6AD1163BB9800E0D453 /* SBValue.cpp */; };
     9A22A161135E30370024DDC3 /* EmulateInstructionARM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A22A15D135E30370024DDC3 /* EmulateInstructionARM.cpp */; };
     9A22A163135E30370024DDC3 /* EmulationStateARM.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A22A15F135E30370024DDC3 /* EmulationStateARM.cpp */; };
     9A357583116CFDEE00E8ED2F /* SBValueList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A357582116CFDEE00E8ED2F /* SBValueList.h */; settings = {ATTRIBUTES = (Public, ); }; };
     9A35758E116CFE0F00E8ED2F /* SBValueList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A35758D116CFE0F00E8ED2F /* SBValueList.cpp */; };
     9A357671116E7B5200E8ED2F /* SBStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A357670116E7B5200E8ED2F /* SBStringList.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* Begin PBXBuildFile section */
     B2462247141AD37D00F3D409 /* OptionGroupWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2462246141AD37D00F3D409 /* OptionGroupWatchpoint.cpp */; };
     B27318421416AC12006039C8 /* WatchpointList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B27318411416AC12006039C8 /* WatchpointList.cpp */; };
     B28058A1139988B0002D96D0 /* InferiorCallPOSIX.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B28058A0139988B0002D96D0 /* InferiorCallPOSIX.cpp */; };
     B299580B14F2FA1400050A04 /* DisassemblerLLVMC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B299580A14F2FA1400050A04 /* DisassemblerLLVMC.cpp */; };
     B2A58722143119810092BFBA /* SBWatchpoint.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A58721143119810092BFBA /* SBWatchpoint.h */; settings = {ATTRIBUTES = (Public, ); }; };
     B2A58724143119D50092BFBA /* SBWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A58723143119D50092BFBA /* SBWatchpoint.cpp */; };
     B2B7CCEB15D1BD6700EEFB57 /* CommandObjectWatchpointCommand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B7CCEA15D1BD6600EEFB57 /* CommandObjectWatchpointCommand.cpp */; };
     B2B7CCF015D1C20F00EEFB57 /* WatchpointOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2B7CCEF15D1C20F00EEFB57 /* WatchpointOptions.cpp */; };
+    E769331C1A94D15400C73337 /* lldb-gdbserver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */; };
+    E769331E1A94D18100C73337 /* lldb-server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E769331D1A94D18100C73337 /* lldb-server.cpp */; };
     ED4AFF45199C2218004FFDC6 /* com.apple.lldb.launcherRootXPCService.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = EDE274EC14EDCE1F005B0F75 /* com.apple.lldb.launcherRootXPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
     ED4AFF46199C2224004FFDC6 /* com.apple.lldb.launcherXPCService.xpc in CopyFiles */ = {isa = PBXBuildFile; fileRef = EDC6D49914E5C19B001B75F8 /* com.apple.lldb.launcherXPCService.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
     ED88244E15114A9200BC98B9 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDB919B414F6F10D008FF64B /* Security.framework */; };
     ED88245015114CA200BC98B9 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED88244F15114CA200BC98B9 /* main.mm */; };
     ED88245115114CA200BC98B9 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED88244F15114CA200BC98B9 /* main.mm */; };
     ED88245315114CFC00BC98B9 /* LauncherRootXPCService.mm in Sources */ = {isa = PBXBuildFile; fileRef = ED88245215114CFC00BC98B9 /* LauncherRootXPCService.mm */; };
     EDC6D4AA14E5C49E001B75F8 /* LauncherXPCService.mm in Sources */ = {isa = PBXBuildFile; fileRef = EDC6D49414E5C15C001B75F8 /* LauncherXPCService.mm */; };
 /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
     };
     26CEF3C114FD5973007286B2 /* PBXContainerItemProxy */ = {
       isa = PBXContainerItemProxy;
       containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
       proxyType = 1;
       remoteGlobalIDString = 26F5C26910F3D9A4009D5894;
       remoteInfo = "lldb-tool";
     };
-    26D6F3F8183E80BD00194858 /* PBXContainerItemProxy */ = {
-      isa = PBXContainerItemProxy;
-      containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
-      proxyType = 1;
-      remoteGlobalIDString = 2689FFC913353D7A00698AC0;
-      remoteInfo = "lldb-core";
-    };
     26DC6A151337FE7300FF7998 /* PBXContainerItemProxy */ = {
       isa = PBXContainerItemProxy;
       containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
       proxyType = 1;
       remoteGlobalIDString = 2689FFC913353D7A00698AC0;
       remoteInfo = "lldb-core";
     };
     26DF745F1A6DCDB300B85563 /* PBXContainerItemProxy */ = {
942829CD1A89842900521B30 /* PBXContainerItemProxy */ = {
       remoteGlobalIDString = 942829BF1A89835300521B30;
       remoteInfo = argdumper;
     };
     94E829C8152D33B4006F96A3 /* PBXContainerItemProxy */ = {
       isa = PBXContainerItemProxy;
       containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
       proxyType = 1;
       remoteGlobalIDString = 26DC6A0F1337FE6900FF7998;
-      remoteInfo = "lldb-platform";
+      remoteInfo = "lldb-server";
     };
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXCopyFilesBuildPhase section */
-    26D6F3E5183E7F4E00194858 /* CopyFiles */ = {
-      isa = PBXCopyFilesBuildPhase;
-      buildActionMask = 2147483647;
-      dstPath = /usr/share/man/man1/;
-      dstSubfolderSpec = 0;
-      files = (
-      );
-      runOnlyForDeploymentPostprocessing = 1;
-    };
     940B04E31A89875C0045D5F7 /* CopyFiles */ = {
       isa = PBXCopyFilesBuildPhase;
       buildActionMask = 2147483647;
       dstPath = "";
       dstSubfolderSpec = 7;
       files = (
         940B04E41A8987680045D5F7 /* argdumper in CopyFiles */,
       );
/* Begin PBXFileReference section */
     26D1804616CEE12C00EDFB5B /* TimeSpecTimeout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TimeSpecTimeout.h; path = source/Utility/TimeSpecTimeout.h; sourceTree = "<group>"; };
     26D27C9D11ED3A4E0024D721 /* ELFHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ELFHeader.cpp; sourceTree = "<group>"; };
     26D27C9E11ED3A4E0024D721 /* ELFHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELFHeader.h; sourceTree = "<group>"; };
     26D55234159A7DB100708D8D /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = /usr/lib/libxml2.dylib; sourceTree = "<absolute>"; };
     26D5E15E135BAEA2006EA0A7 /* OptionGroupArchitecture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupArchitecture.cpp; path = source/Interpreter/OptionGroupArchitecture.cpp; sourceTree = "<group>"; };
     26D5E160135BAEB0006EA0A7 /* OptionGroupArchitecture.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionGroupArchitecture.h; path = include/lldb/Interpreter/OptionGroupArchitecture.h; sourceTree = "<group>"; };
     26D5E161135BB040006EA0A7 /* OptionGroupPlatform.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = OptionGroupPlatform.h; path = include/lldb/Interpreter/OptionGroupPlatform.h; sourceTree = "<group>"; };
     26D5E162135BB054006EA0A7 /* OptionGroupPlatform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionGroupPlatform.cpp; path = source/Interpreter/OptionGroupPlatform.cpp; sourceTree = "<group>"; };
-    26D6F3E7183E7F4E00194858 /* lldb-gdbserver */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-gdbserver"; sourceTree = BUILT_PRODUCTS_DIR; };
-    26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "lldb-gdbserver.cpp"; sourceTree = "<group>"; };
+    26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-gdbserver.cpp"; path = "tools/lldb-server/lldb-gdbserver.cpp"; sourceTree = "<group>"; };
     26D7E45B13D5E2F9007FD12B /* SocketAddress.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SocketAddress.h; path = include/lldb/Host/SocketAddress.h; sourceTree = "<group>"; };
     26D7E45C13D5E30A007FD12B /* SocketAddress.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SocketAddress.cpp; path = source/Host/common/SocketAddress.cpp; sourceTree = "<group>"; };
     26D9FDC612F784E60003F2EE /* EmulateInstruction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EmulateInstruction.h; path = include/lldb/Core/EmulateInstruction.h; sourceTree = "<group>"; };
     26D9FDC812F784FD0003F2EE /* EmulateInstruction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EmulateInstruction.cpp; path = source/Core/EmulateInstruction.cpp; sourceTree = "<group>"; };
     26DAED5F15D327A200E15819 /* OptionValuePathMappings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OptionValuePathMappings.h; path = include/lldb/Interpreter/OptionValuePathMappings.h; sourceTree = "<group>"; };
     26DAED6215D327C200E15819 /* OptionValuePathMappings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OptionValuePathMappings.cpp; path = source/Interpreter/OptionValuePathMappings.cpp; sourceTree = "<group>"; };
     26DAFD9711529BC7005A394E /* ExecutionContextScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExecutionContextScope.h; path = include/lldb/Target/ExecutionContextScope.h; sourceTree = "<group>"; };
     26DB3E071379E7AD0080DC73 /* ABIMacOSX_arm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ABIMacOSX_arm.cpp; sourceTree = "<group>"; };
     26DB3E081379E7AD0080DC73 /* ABIMacOSX_arm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABIMacOSX_arm.h; sourceTree = "<group>"; };
     26DB3E0B1379E7AD0080DC73 /* ABIMacOSX_arm64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ABIMacOSX_arm64.cpp; sourceTree = "<group>"; };
     26DB3E0C1379E7AD0080DC73 /* ABIMacOSX_arm64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABIMacOSX_arm64.h; sourceTree = "<group>"; };
     26DB3E0F1379E7AD0080DC73 /* ABIMacOSX_i386.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ABIMacOSX_i386.cpp; sourceTree = "<group>"; };
     26DB3E101379E7AD0080DC73 /* ABIMacOSX_i386.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABIMacOSX_i386.h; sourceTree = "<group>"; };
     26DB3E131379E7AD0080DC73 /* ABISysV_x86_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ABISysV_x86_64.cpp; sourceTree = "<group>"; };
     26DB3E141379E7AD0080DC73 /* ABISysV_x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ABISysV_x86_64.h; sourceTree = "<group>"; };
-    26DC6A101337FE6900FF7998 /* lldb-platform */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-platform"; sourceTree = BUILT_PRODUCTS_DIR; };
-    26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-platform.cpp"; path = "tools/lldb-platform/lldb-platform.cpp"; sourceTree = "<group>"; };
+    26DC6A101337FE6900FF7998 /* lldb-server */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "lldb-server"; sourceTree = BUILT_PRODUCTS_DIR; };
+    26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-platform.cpp"; path = "tools/lldb-server/lldb-platform.cpp"; sourceTree = "<group>"; };
     26DE1E6A11616C2E00A093E2 /* lldb-forward.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = "lldb-forward.h"; path = "include/lldb/lldb-forward.h"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
     26DE204011618AB900A093E2 /* SBSymbolContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBSymbolContext.h; path = include/lldb/API/SBSymbolContext.h; sourceTree = "<group>"; };
     26DE204211618ACA00A093E2 /* SBAddress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBAddress.h; path = include/lldb/API/SBAddress.h; sourceTree = "<group>"; };
     26DE204411618ADA00A093E2 /* SBAddress.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBAddress.cpp; path = source/API/SBAddress.cpp; sourceTree = "<group>"; };
     26DE204611618AED00A093E2 /* SBSymbolContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBSymbolContext.cpp; path = source/API/SBSymbolContext.cpp; sourceTree = "<group>"; };
     26DE204C11618E7A00A093E2 /* SBModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBModule.cpp; path = source/API/SBModule.cpp; sourceTree = "<group>"; };
     26DE204E11618E9800A093E2 /* SBModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBModule.h; path = include/lldb/API/SBModule.h; sourceTree = "<group>"; };
     26DE205211618FAC00A093E2 /* SBFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBFunction.h; path = include/lldb/API/SBFunction.h; sourceTree = "<group>"; };

     B2A58721143119810092BFBA /* SBWatchpoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SBWatchpoint.h; path = include/lldb/API/SBWatchpoint.h; sourceTree = "<group>"; };
     B2A58723143119D50092BFBA /* SBWatchpoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SBWatchpoint.cpp; path = source/API/SBWatchpoint.cpp; sourceTree = "<group>"; };
     B2A5872514313B480092BFBA /* SBWatchpoint.i */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.h; path = SBWatchpoint.i; sourceTree = "<group>"; };
     B2B7CCEA15D1BD6600EEFB57 /* CommandObjectWatchpointCommand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CommandObjectWatchpointCommand.cpp; path = source/Commands/CommandObjectWatchpointCommand.cpp; sourceTree = "<group>"; };
     B2B7CCEC15D1BD9600EEFB57 /* CommandObjectWatchpointCommand.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = CommandObjectWatchpointCommand.h; path = source/Commands/CommandObjectWatchpointCommand.h; sourceTree = "<group>"; };
     B2B7CCED15D1BFB700EEFB57 /* WatchpointOptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WatchpointOptions.h; path = include/lldb/Breakpoint/WatchpointOptions.h; sourceTree = "<group>"; };
     B2B7CCEF15D1C20F00EEFB57 /* WatchpointOptions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WatchpointOptions.cpp; path = source/Breakpoint/WatchpointOptions.cpp; sourceTree = "<group>"; };
     B2D3033612EFA5C500F84EB3 /* InstructionUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InstructionUtils.h; path = Utility/InstructionUtils.h; sourceTree = "<group>"; };
+    E769331D1A94D18100C73337 /* lldb-server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "lldb-server.cpp"; path = "tools/lldb-server/lldb-server.cpp"; sourceTree = "<group>"; };
     ED88244F15114CA200BC98B9 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
     ED88245215114CFC00BC98B9 /* LauncherRootXPCService.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LauncherRootXPCService.mm; sourceTree = "<group>"; };
     EDB919B214F6EC85008FF64B /* LauncherXPCService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LauncherXPCService.h; sourceTree = "<group>"; };
     EDB919B414F6F10D008FF64B /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; };
     EDC6D49214E5C15C001B75F8 /* LauncherXPCService-Info.plist */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; path = "LauncherXPCService-Info.plist"; sourceTree = "<group>"; };
     EDC6D49314E5C15C001B75F8 /* LauncherXPCService.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = LauncherXPCService.entitlements; sourceTree = "<group>"; };
     EDC6D49414E5C15C001B75F8 /* LauncherXPCService.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LauncherXPCService.mm; sourceTree = "<group>"; };
     EDC6D49914E5C19B001B75F8 /* com.apple.lldb.launcherXPCService.xpc */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = com.apple.lldb.launcherXPCService.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
/* Begin PBXFrameworksBuildPhase section */
     2690CD141A6DC0D000E717C8 /* Frameworks */ = {
       isa = PBXFrameworksBuildPhase;
       buildActionMask = 2147483647;
       files = (
         2669424D1A6DC32B0063BE93 /* LLDB.framework in Frameworks */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
-    26D6F3E4183E7F4E00194858 /* Frameworks */ = {
-      isa = PBXFrameworksBuildPhase;
-      buildActionMask = 2147483647;
-      files = (
-        260157C71885F52500F875CF /* libpanel.dylib in Frameworks */,
-        26780C651867C34500234593 /* libncurses.dylib in Frameworks */,
-        26CFDCA71861646C000E63E5 /* libedit.dylib in Frameworks */,
-        26D6F3FA183E888800194858 /* liblldb-core.a in Frameworks */,
-        2606EDDE184E68940034641B /* Foundation.framework in Frameworks */,
-        966C6B7B18E6A56A0093F5EC /* libz.dylib in Frameworks */,
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-    };
     26DC6A0E1337FE6900FF7998 /* Frameworks */ = {
       isa = PBXFrameworksBuildPhase;
       buildActionMask = 2147483647;
       files = (
         260157C61885F51C00F875CF /* libpanel.dylib in Frameworks */,
         966C6B7C18E6A56A0093F5EC /* libz.dylib in Frameworks */,
         26780C611867C33D00234593 /* libncurses.dylib in Frameworks */,
         26CFDCA818616473000E63E5 /* libedit.dylib in Frameworks */,
08FB7795FE84155DC02AAC07 /* Source */ = {
       usesTabs = 0;
     };
     1AB674ADFE9D54B511CA2CBB /* Products */ = {
       isa = PBXGroup;
       children = (
         26F5C26A10F3D9A4009D5894 /* lldb */,
         26680207115FD0ED008E1FE4 /* LLDB.framework */,
         26579F68126A25920007C5CB /* darwin-debug */,
-        26DC6A101337FE6900FF7998 /* lldb-platform */,
+        26DC6A101337FE6900FF7998 /* lldb-server */,
         EDC6D49914E5C19B001B75F8 /* com.apple.lldb.launcherXPCService.xpc */,
         EDE274EC14EDCE1F005B0F75 /* com.apple.lldb.launcherRootXPCService.xpc */,
-        26D6F3E7183E7F4E00194858 /* lldb-gdbserver */,
         2690CD171A6DC0D000E717C8 /* lldb-mi */,
         942829C01A89835300521B30 /* argdumper */,
       );
       name = Products;
       sourceTree = "<group>";
       usesTabs = 0;
     };
     23042D0F1976C9D800621B2C /* Kalimba */ = {
26C5577F132575C8008FD8FE /* MacOSX */ = {
         26C5577B132575AD008FD8FE /* PlatformMacOSX.cpp */,
         26C5577C132575AD008FD8FE /* PlatformMacOSX.h */,
         2675F6FE1332BE690067997B /* PlatformRemoteiOS.cpp */,
         2675F6FF1332BE690067997B /* PlatformRemoteiOS.h */,
       );
       path = MacOSX;
       sourceTree = "<group>";
     };
-    26D6F3F2183E7F9300194858 /* lldb-gdbserver */ = {
-      isa = PBXGroup;
-      children = (
-        26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */,
-      );
-      name = "lldb-gdbserver";
-      path = "tools/lldb-gdbserver";
-      sourceTree = "<group>";
-    };
     26D9FDCA12F785120003F2EE /* Instruction */ = {
       isa = PBXGroup;
       children = (
         26D9FDCB12F785270003F2EE /* ARM */,
         264A12F91372522000875C42 /* ARM64 */,
       );
       path = Instruction;
       sourceTree = "<group>";
26DB3E121379E7AD0080DC73 /* SysV-x86_64 */ = {
       isa = PBXGroup;
       children = (
         26DB3E131379E7AD0080DC73 /* ABISysV_x86_64.cpp */,
         26DB3E141379E7AD0080DC73 /* ABISysV_x86_64.h */,
       );
       path = "SysV-x86_64";
       sourceTree = "<group>";
     };
-    26DC6A1B1337FEA400FF7998 /* lldb-platform */ = {
-      isa = PBXGroup;
-      children = (
-        26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */,
-      );
-      name = "lldb-platform";
-      sourceTree = "<group>";
-    };
     26E152221419CACA007967D0 /* PECOFF */ = {
       isa = PBXGroup;
       children = (
         26E152231419CACA007967D0 /* ObjectFilePECOFF.cpp */,
         26E152241419CACA007967D0 /* ObjectFilePECOFF.h */,
       );
       path = PECOFF;
       sourceTree = "<group>";
     };
     26EFC4C718CFAF0D00865D87 /* JIT */ = {
       isa = PBXGroup;
       children = (
         26EFC4CA18CFAF0D00865D87 /* ObjectFileJIT.cpp */,
         26EFC4CB18CFAF0D00865D87 /* ObjectFileJIT.h */,
       );
       path = JIT;
       sourceTree = "<group>";
     };
     26F5C22410F3D950009D5894 /* Tools */ = {
       isa = PBXGroup;
       children = (
+        E769331B1A94D10E00C73337 /* lldb-server */,
         942829BA1A89830900521B30 /* argdumper */,
         26579F55126A255E0007C5CB /* darwin-debug */,
         265E9BE0115C2B8500D0DCCB /* debugserver */,
         26F5C22510F3D956009D5894 /* Driver */,
         2665CD0915080846002C8FAE /* install-headers */,
-        26D6F3F2183E7F9300194858 /* lldb-gdbserver */,
-        26DC6A1B1337FEA400FF7998 /* lldb-platform */,
       );
       name = Tools;
       sourceTree = "<group>";
       usesTabs = 0;
     };
     26F5C22510F3D956009D5894 /* Driver */ = {
       isa = PBXGroup;
       children = (
AF77E08C1A033C4B0096C0EA /* SysV-ppc64 */ = {
       isa = PBXGroup;
       children = (
         AF77E0911A033C7F0096C0EA /* ABISysV_ppc64.cpp */,
         AF77E0921A033C7F0096C0EA /* ABISysV_ppc64.h */,
       );
       name = "SysV-ppc64";
       sourceTree = "<group>";
     };
+    E769331B1A94D10E00C73337 /* lldb-server */ = {
+      isa = PBXGroup;
+      children = (
+        E769331D1A94D18100C73337 /* lldb-server.cpp */,
+        26DC6A1C1337FECA00FF7998 /* lldb-platform.cpp */,
+        26D6F3F4183E7F9300194858 /* lldb-gdbserver.cpp */,
+      );
+      name = "lldb-server";
+      sourceTree = "<group>";
+    };
     EDC6D49114E5C15C001B75F8 /* launcherXPCService */ = {
       isa = PBXGroup;
       children = (
         EDC6D49214E5C15C001B75F8 /* LauncherXPCService-Info.plist */,
         EDE274E114EDCE0D005B0F75 /* LauncherRootXPCService-Info.plist */,
         EDC6D49314E5C15C001B75F8 /* LauncherXPCService.entitlements */,
         ED88244F15114CA200BC98B9 /* main.mm */,
         EDB919B214F6EC85008FF64B /* LauncherXPCService.h */,
2690CD161A6DC0D000E717C8 /* lldb-mi */ = {
       dependencies = (
         26DF74601A6DCDB300B85563 /* PBXTargetDependency */,
       );
       name = "lldb-mi";
       productName = "lldb-mi";
       productReference = 2690CD171A6DC0D000E717C8 /* lldb-mi */;
       productType = "com.apple.product-type.tool";
     };
-    26D6F3E6183E7F4E00194858 /* lldb-gdbserver */ = {
+    26DC6A0F1337FE6900FF7998 /* lldb-server */ = {
       isa = PBXNativeTarget;
-      buildConfigurationList = 26D6F3F1183E7F4F00194858 /* Build configuration list for PBXNativeTarget "lldb-gdbserver" */;
-      buildPhases = (
-        26D6F3E3183E7F4E00194858 /* Sources */,
-        26D6F3E4183E7F4E00194858 /* Frameworks */,
-        26D6F3E5183E7F4E00194858 /* CopyFiles */,
-      );
-      buildRules = (
-      );
-      dependencies = (
-        26D6F3F9183E80BD00194858 /* PBXTargetDependency */,
-      );
-      name = "lldb-gdbserver";
-      productName = "lldb-gdbserver";
-      productReference = 26D6F3E7183E7F4E00194858 /* lldb-gdbserver */;
-      productType = "com.apple.product-type.tool";
-    };
-    26DC6A0F1337FE6900FF7998 /* lldb-platform */ = {
-      isa = PBXNativeTarget;
-      buildConfigurationList = 26DC6A1A1337FE8B00FF7998 /* Build configuration list for PBXNativeTarget "lldb-platform" */;
+      buildConfigurationList = 26DC6A1A1337FE8B00FF7998 /* Build configuration list for PBXNativeTarget "lldb-server" */;
       buildPhases = (
         26DC6A0D1337FE6900FF7998 /* Sources */,
         26DC6A0E1337FE6900FF7998 /* Frameworks */,
         4C3326CA18B2A2B800EB5DD7 /* ShellScript */,
       );
       buildRules = (
       );
       dependencies = (
         26DC6A161337FE7300FF7998 /* PBXTargetDependency */,
       );
-      name = "lldb-platform";
-      productName = "lldb-platform";
-      productReference = 26DC6A101337FE6900FF7998 /* lldb-platform */;
+      name = "lldb-server";
+      productName = "lldb-server";
+      productReference = 26DC6A101337FE6900FF7998 /* lldb-server */;
       productType = "com.apple.product-type.tool";
     };
     26F5C26910F3D9A4009D5894 /* lldb-tool */ = {
       isa = PBXNativeTarget;
       buildConfigurationList = 26F5C26E10F3D9C5009D5894 /* Build configuration list for PBXNativeTarget "lldb-tool" */;
       buildPhases = (
         26F5C26710F3D9A4009D5894 /* Sources */,
         26F5C26810F3D9A4009D5894 /* Frameworks */,
08FB7793FE84155DC02AAC07 /* Project object */ = {
       targets = (
         26CEF3B114FD592B007286B2 /* desktop */,
         26CEF3A914FD58BF007286B2 /* desktop_no_xpc */,
         26CEF3BC14FD596A007286B2 /* ios */,
         26F5C26910F3D9A4009D5894 /* lldb-tool */,
         26680206115FD0ED008E1FE4 /* LLDB */,
         26579F67126A25920007C5CB /* darwin-debug */,
         2689FFC913353D7A00698AC0 /* lldb-core */,
-        26D6F3E6183E7F4E00194858 /* lldb-gdbserver */,
-        26DC6A0F1337FE6900FF7998 /* lldb-platform */,
+        26DC6A0F1337FE6900FF7998 /* lldb-server */,
         EDC6D49814E5C19B001B75F8 /* launcherXPCService */,
         EDE274E214EDCE1F005B0F75 /* launcherRootXPCService */,
         2687EAC51508110B00DD8C2E /* install-headers */,
         235AFBB5199BC6AD00897A4B /* Linux */,
         235AFBBB199BC6FD00897A4B /* MacOSX and Linux */,
         2690CD161A6DC0D000E717C8 /* lldb-mi */,
         942829BF1A89835300521B30 /* argdumper */,
       );
/* Begin PBXReferenceProxy section */
     };
 /* End PBXReferenceProxy section */
 
 /* Begin PBXResourcesBuildPhase section */
     26680203115FD0ED008E1FE4 /* Resources */ = {
       isa = PBXResourcesBuildPhase;
       buildActionMask = 2147483647;
       files = (
-        94E829CA152D33C1006F96A3 /* lldb-platform in Resources */,
+        94E829CA152D33C1006F96A3 /* lldb-server in Resources */,
         262CFC7711A4510000946C6C /* debugserver in Resources */,
         26368AF7126B960500E8659F /* darwin-debug in Resources */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
     EDC6D49714E5C19B001B75F8 /* Resources */ = {
       isa = PBXResourcesBuildPhase;
       buildActionMask = 2147483647;
2690CD131A6DC0D000E717C8 /* Sources */ = {
         266942431A6DC2AC0063BE93 /* MIUtilFileStd.cpp in Sources */,
         2669422F1A6DC2AC0063BE93 /* MICmnMIOutOfBandRecord.cpp in Sources */,
         2669420F1A6DC2AC0063BE93 /* MICmdCmdData.cpp in Sources */,
         266942421A6DC2AC0063BE93 /* MIUtilDebug.cpp in Sources */,
         2669423D1A6DC2AC0063BE93 /* MIDriver.cpp in Sources */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
-    26D6F3E3183E7F4E00194858 /* Sources */ = {
-      isa = PBXSourcesBuildPhase;
-      buildActionMask = 2147483647;
-      files = (
-        26D6F3F6183E7F9300194858 /* lldb-gdbserver.cpp in Sources */,
-      );
-      runOnlyForDeploymentPostprocessing = 0;
-    };
     26DC6A0D1337FE6900FF7998 /* Sources */ = {
       isa = PBXSourcesBuildPhase;
       buildActionMask = 2147483647;
       files = (
+        E769331C1A94D15400C73337 /* lldb-gdbserver.cpp in Sources */,
         26DC6A1D1337FECA00FF7998 /* lldb-platform.cpp in Sources */,
+        E769331E1A94D18100C73337 /* lldb-server.cpp in Sources */,
       );
       runOnlyForDeploymentPostprocessing = 0;
     };
     26F5C26710F3D9A4009D5894 /* Sources */ = {
       isa = PBXSourcesBuildPhase;
       buildActionMask = 2147483647;
       files = (
         26F5C27710F3D9E4009D5894 /* Driver.cpp in Sources */,
26CEF3BB14FD595B007286B2 /* PBXTargetDependency */ = {
       target = 26F5C26910F3D9A4009D5894 /* lldb-tool */;
       targetProxy = 26CEF3BA14FD595B007286B2 /* PBXContainerItemProxy */;
     };
     26CEF3C214FD5973007286B2 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 26F5C26910F3D9A4009D5894 /* lldb-tool */;
       targetProxy = 26CEF3C114FD5973007286B2 /* PBXContainerItemProxy */;
     };
-    26D6F3F9183E80BD00194858 /* PBXTargetDependency */ = {
-      isa = PBXTargetDependency;
-      target = 2689FFC913353D7A00698AC0 /* lldb-core */;
-      targetProxy = 26D6F3F8183E80BD00194858 /* PBXContainerItemProxy */;
-    };
     26DC6A161337FE7300FF7998 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 2689FFC913353D7A00698AC0 /* lldb-core */;
       targetProxy = 26DC6A151337FE7300FF7998 /* PBXContainerItemProxy */;
     };
     26DF74601A6DCDB300B85563 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 26680206115FD0ED008E1FE4 /* LLDB */;
       targetProxy = 26DF745F1A6DCDB300B85563 /* PBXContainerItemProxy */;
     };
     942829CA1A89836A00521B30 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 2689FFC913353D7A00698AC0 /* lldb-core */;
       targetProxy = 942829C91A89836A00521B30 /* PBXContainerItemProxy */;
     };
     942829CE1A89842900521B30 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
       target = 942829BF1A89835300521B30 /* argdumper */;
       targetProxy = 942829CD1A89842900521B30 /* PBXContainerItemProxy */;
     };
     94E829C9152D33B4006F96A3 /* PBXTargetDependency */ = {
       isa = PBXTargetDependency;
-      target = 26DC6A0F1337FE6900FF7998 /* lldb-platform */;
+      target = 26DC6A0F1337FE6900FF7998 /* lldb-server */;
       targetProxy = 94E829C8152D33B4006F96A3 /* PBXContainerItemProxy */;
     };
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
     1DEB91F008733DB70010E9CD /* Debug */ = {
       isa = XCBuildConfiguration;
       buildSettings = {

     26CEF3C014FD596A007286B2 /* BuildAndIntegration */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
         COMBINE_HIDPI_IMAGES = YES;
         PRODUCT_NAME = "$(TARGET_NAME)";
       };
       name = BuildAndIntegration;
     };
-    26D6F3ED183E7F4F00194858 /* Debug */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
-        "CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
-        DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-gdbserver/exports";
-        FRAMEWORK_SEARCH_PATHS = (
-          "$(inherited)",
-          "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-        );
-        GCC_C_LANGUAGE_STANDARD = gnu99;
-        GCC_DYNAMIC_NO_PIC = NO;
-        GCC_ENABLE_CPP_RTTI = NO;
-        GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-        GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-        GCC_PREPROCESSOR_DEFINITIONS = (
-          "DEBUG=1",
-          "$(inherited)",
-        );
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        INFOPLIST_PREPROCESSOR_DEFINITIONS = (
-          "-lobjc",
-          "-lpython",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          AppKit,
-          "-v",
-          "-Wl,-v",
-        );
-        LIBRARY_SEARCH_PATHS = (
-          "$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
-          "$(inherited)",
-        );
-        OTHER_LDFLAGS = (
-          "-lllvmclang",
-          "-lpython",
-          "-lxml2",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          Security,
-        );
-        "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-          "-lllvmclang",
-          "-lxml2",
-          "-framework",
-          Foundation,
-          "-framework",
-          UIKit,
-        );
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
-      };
-      name = Debug;
-    };
-    26D6F3EE183E7F4F00194858 /* DebugClang */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
-        "CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
-        DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-gdbserver/exports";
-        FRAMEWORK_SEARCH_PATHS = (
-          "$(inherited)",
-          "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-        );
-        GCC_C_LANGUAGE_STANDARD = gnu99;
-        GCC_DYNAMIC_NO_PIC = NO;
-        GCC_ENABLE_CPP_RTTI = NO;
-        GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-        GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-        GCC_PREPROCESSOR_DEFINITIONS = (
-          "DEBUG=1",
-          "$(inherited)",
-        );
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        INFOPLIST_PREPROCESSOR_DEFINITIONS = (
-          "-lobjc",
-          "-lpython",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          AppKit,
-          "-v",
-          "-Wl,-v",
-        );
-        LIBRARY_SEARCH_PATHS = (
-          "$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
-          "$(inherited)",
-        );
-        OTHER_LDFLAGS = (
-          "-lllvmclang",
-          "-lpython",
-          "-lxml2",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          Security,
-        );
-        "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-          "-lllvmclang",
-          "-lxml2",
-          "-framework",
-          Foundation,
-          "-framework",
-          UIKit,
-        );
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
-      };
-      name = DebugClang;
-    };
-    26D6F3EF183E7F4F00194858 /* Release */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
-        "CODE_SIGN_IDENTITY[sdk=macosx*]" = lldb_codesign;
-        COPY_PHASE_STRIP = NO;
-        DEAD_CODE_STRIPPING = YES;
-        ENABLE_NS_ASSERTIONS = NO;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-gdbserver/exports";
-        FRAMEWORK_SEARCH_PATHS = (
-          "$(inherited)",
-          "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-        );
-        GCC_C_LANGUAGE_STANDARD = gnu99;
-        GCC_ENABLE_CPP_RTTI = NO;
-        GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-        GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        INFOPLIST_PREPROCESSOR_DEFINITIONS = (
-          "-lobjc",
-          "-lpython",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          AppKit,
-          "-v",
-          "-Wl,-v",
-        );
-        LIBRARY_SEARCH_PATHS = (
-          "$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
-          "$(inherited)",
-        );
-        OTHER_LDFLAGS = (
-          "-lllvmclang",
-          "-lpython",
-          "-lxml2",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          Security,
-        );
-        "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-          "-lllvmclang",
-          "-lxml2",
-          "-framework",
-          Foundation,
-          "-framework",
-          UIKit,
-        );
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
-      };
-      name = Release;
-    };
-    26D6F3F0183E7F4F00194858 /* BuildAndIntegration */ = {
-      isa = XCBuildConfiguration;
-      buildSettings = {
-        CLANG_ENABLE_OBJC_ARC = YES;
-        CLANG_WARN_BOOL_CONVERSION = YES;
-        CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-        CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-        COPY_PHASE_STRIP = YES;
-        DEAD_CODE_STRIPPING = YES;
-        ENABLE_NS_ASSERTIONS = NO;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-gdbserver/exports";
-        FRAMEWORK_SEARCH_PATHS = (
-          "$(inherited)",
-          "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
-        );
-        GCC_C_LANGUAGE_STANDARD = gnu99;
-        GCC_ENABLE_CPP_RTTI = NO;
-        GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-        GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-        GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-        GCC_WARN_UNDECLARED_SELECTOR = YES;
-        GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-        INFOPLIST_PREPROCESSOR_DEFINITIONS = (
-          "-lobjc",
-          "-lpython",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          AppKit,
-          "-v",
-          "-Wl,-v",
-        );
-        INSTALL_PATH = "$(LLDB_FRAMEWORK_INSTALL_DIR)/LLDB.framework/Resources";
-        LIBRARY_SEARCH_PATHS = (
-          "$(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)",
-          "$(inherited)",
-        );
-        OTHER_LDFLAGS = (
-          "-lllvmclang",
-          "-lpython",
-          "-lxml2",
-          "-framework",
-          DebugSymbols,
-          "-framework",
-          Carbon,
-          "-framework",
-          Foundation,
-          "-framework",
-          Security,
-        );
-        "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
-          "-lllvmclang",
-          "-lxml2",
-          "-framework",
-          Foundation,
-          "-framework",
-          UIKit,
-        );
-        PRODUCT_NAME = "$(TARGET_NAME)";
-        SKIP_INSTALL = YES;
-        STRIP_INSTALLED_PRODUCT = YES;
-        USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
-      };
-      name = BuildAndIntegration;
-    };
     26DC6A121337FE6A00FF7998 /* Debug */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
         "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
         "CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
         DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-platform/exports";
+        EXPORTED_SYMBOLS_FILE = "tools/lldb-server/exports";
         FRAMEWORK_SEARCH_PATHS = (
           "$(inherited)",
           "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
         );
         GCC_DYNAMIC_NO_PIC = NO;
         GCC_ENABLE_CPP_RTTI = NO;
         GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
         GCC_OPTIMIZATION_LEVEL = 0;
26DC6A121337FE6A00FF7998 /* Debug */ = {
           Security,
         );
         "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
           "-lllvmclang",
           "-lxml2",
           "-framework",
           Foundation,
         );
-        PRODUCT_NAME = "lldb-platform";
+        PRODUCT_NAME = "lldb-server";
         SKIP_INSTALL = YES;
         USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
       };
       name = Debug;
     };
     26DC6A131337FE6A00FF7998 /* Release */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
         "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
         "CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
         DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-platform/exports";
+        EXPORTED_SYMBOLS_FILE = "tools/lldb-server/exports";
         FRAMEWORK_SEARCH_PATHS = (
           "$(inherited)",
           "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
         );
         GCC_ENABLE_CPP_RTTI = NO;
         GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
         INFOPLIST_PREPROCESSOR_DEFINITIONS = (
           "-lobjc",
26DC6A131337FE6A00FF7998 /* Release */ = {
           Security,
         );
         "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
           "-lllvmclang",
           "-lxml2",
           "-framework",
           Foundation,
         );
-        PRODUCT_NAME = "lldb-platform";
+        PRODUCT_NAME = "lldb-server";
         SKIP_INSTALL = YES;
         USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
       };
       name = Release;
     };
     26DC6A141337FE6A00FF7998 /* BuildAndIntegration */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
         COPY_PHASE_STRIP = YES;
         DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-platform/exports";
+        EXPORTED_SYMBOLS_FILE = "tools/lldb-server/exports";
         FRAMEWORK_SEARCH_PATHS = (
           "$(inherited)",
           "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
         );
         GCC_ENABLE_CPP_RTTI = NO;
         GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
         INFOPLIST_PREPROCESSOR_DEFINITIONS = (
           "-lobjc",
26DC6A141337FE6A00FF7998 /* BuildAndIntegration */ = {
           Security,
         );
         "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
           "-lllvmclang",
           "-lxml2",
           "-framework",
           Foundation,
         );
-        PRODUCT_NAME = "lldb-platform";
+        PRODUCT_NAME = "lldb-server";
         SKIP_INSTALL = YES;
         STRIP_INSTALLED_PRODUCT = YES;
         USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
       };
       name = BuildAndIntegration;
     };
     26F5C26C10F3D9A5009D5894 /* Debug */ = {
       isa = XCBuildConfiguration;
49BB8F3B1611172B00BDD462 /* DebugClang */ = {
       name = DebugClang;
     };
     49BB8F3C1611172B00BDD462 /* DebugClang */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
         "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-";
         "CODE_SIGN_IDENTITY[sdk=macosx*]" = "";
         DEAD_CODE_STRIPPING = YES;
-        EXPORTED_SYMBOLS_FILE = "tools/lldb-platform/exports";
+        EXPORTED_SYMBOLS_FILE = "tools/lldb-server/exports";
         FRAMEWORK_SEARCH_PATHS = (
           "$(inherited)",
           "\"$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks\"",
         );
         GCC_DYNAMIC_NO_PIC = NO;
         GCC_ENABLE_CPP_RTTI = NO;
         GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
         GCC_OPTIMIZATION_LEVEL = 0;
49BB8F3C1611172B00BDD462 /* DebugClang */ = {
           Security,
         );
         "OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
           "-lllvmclang",
           "-lxml2",
           "-framework",
           Foundation,
         );
-        PRODUCT_NAME = "lldb-platform";
+        PRODUCT_NAME = "lldb-server";
         SKIP_INSTALL = YES;
         USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source $(LLVM_SOURCE_DIR)/include $(LLVM_SOURCE_DIR)/tools/clang/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/include $(LLVM_BUILD_DIR)/$(LLVM_BUILD_DIR_ARCH)/tools/clang/include";
       };
       name = DebugClang;
     };
     49BB8F3D1611172B00BDD462 /* DebugClang */ = {
       isa = XCBuildConfiguration;
       buildSettings = {
26CEF3BD14FD596A007286B2 /* Build configuration list for PBXAggregateTarget "ios" */ = {
         26CEF3BE14FD596A007286B2 /* Debug */,
         49BB8F371611172B00BDD462 /* DebugClang */,
         26CEF3BF14FD596A007286B2 /* Release */,
         26CEF3C014FD596A007286B2 /* BuildAndIntegration */,
       );
       defaultConfigurationIsVisible = 0;
       defaultConfigurationName = BuildAndIntegration;
     };
-    26D6F3F1183E7F4F00194858 /* Build configuration list for PBXNativeTarget "lldb-gdbserver" */ = {
-      isa = XCConfigurationList;
-      buildConfigurations = (
-        26D6F3ED183E7F4F00194858 /* Debug */,
-        26D6F3EE183E7F4F00194858 /* DebugClang */,
-        26D6F3EF183E7F4F00194858 /* Release */,
-        26D6F3F0183E7F4F00194858 /* BuildAndIntegration */,
-      );
-      defaultConfigurationIsVisible = 0;
-      defaultConfigurationName = BuildAndIntegration;
-    };
-    26DC6A1A1337FE8B00FF7998 /* Build configuration list for PBXNativeTarget "lldb-platform" */ = {
+    26DC6A1A1337FE8B00FF7998 /* Build configuration list for PBXNativeTarget "lldb-server" */ = {
       isa = XCConfigurationList;
       buildConfigurations = (
         26DC6A121337FE6A00FF7998 /* Debug */,
         49BB8F3C1611172B00BDD462 /* DebugClang */,
         26DC6A131337FE6A00FF7998 /* Release */,
         26DC6A141337FE6A00FF7998 /* BuildAndIntegration */,
       );
       defaultConfigurationIsVisible = 0;

lldb/trunk/source/Plugins/Process/gdb-remote/GDBRemoteCommunication.cpp

 #include "llvm/ADT/SmallString.h"
 
 // Project includes
 #include "ProcessGDBRemoteLog.h"
 
 #if defined(__APPLE__)
 # define DEBUGSERVER_BASENAME    "debugserver"
 #else
-# define DEBUGSERVER_BASENAME    "lldb-gdbserver"
+# define DEBUGSERVER_BASENAME    "lldb-server"
 #endif
 
 using namespace lldb;
 using namespace lldb_private;
 
 GDBRemoteCommunication::History::History (uint32_t size) :
     m_packets(),
     m_curr_idx (0),
GDBRemoteCommunication::StartDebugserverProcess (const char *hostname,
     
     if (debugserver_exists)
     {
         debugserver_file_spec.GetPath (debugserver_path, sizeof(debugserver_path));
 
         Args &debugserver_args = launch_info.GetArguments();
         debugserver_args.Clear();
         char arg_cstr[PATH_MAX];
-        
         // Start args with "debugserver /file/path -r --"
         debugserver_args.AppendArgument(debugserver_path);
 
+#if !defined(__APPLE__)
+        // First argument to lldb-server must be mode in which to run.
+        debugserver_args.AppendArgument("gdbserver");
+#endif
+
         // If a host and port is supplied then use it
         char host_and_port[128];
         if (hostname)
         {
             snprintf (host_and_port, sizeof(host_and_port), "%s:%u", hostname, in_port);
             debugserver_args.AppendArgument(host_and_port);
         }
         else

lldb/trunk/test/tools/lldb-gdbserver/gdbremote_testcase.py

def get_stub_port_from_named_socket(self, read_timeout_seconds=5):
         return stub_port
 
     def init_llgs_test(self, use_named_pipe=True):
         self.debug_monitor_exe = get_lldb_gdbserver_exe()
         if not self.debug_monitor_exe:
             self.skipTest("lldb_gdbserver exe not found")
         dname = os.path.join(os.environ["LLDB_TEST"],
                              os.environ["LLDB_SESSION_DIRNAME"])
-        self.debug_monitor_extra_args = " -c 'log enable -T -f {}/process-{}.log lldb break process thread' -c 'log enable -T -f {}/packets-{}.log gdb-remote packets'".format(dname, self.id(), dname, self.id())
+        self.debug_monitor_extra_args = " gdbserver -c 'log enable -T -f {}/process-{}.log lldb break process thread' -c 'log enable -T -f {}/packets-{}.log gdb-remote packets'".format(dname, self.id(), dname, self.id())
         if use_named_pipe:
             (self.named_pipe_path, self.named_pipe, self.named_pipe_fd) = self.create_named_pipe()
 
     def init_debugserver_test(self, use_named_pipe=True):
         self.debug_monitor_exe = get_debugserver_exe()
         if not self.debug_monitor_exe:
             self.skipTest("debugserver exe not found")
         self.debug_monitor_extra_args = " --log-file=/tmp/packets-{}.log --log-flags=0x800000".format(self._testMethodName)

lldb/trunk/test/tools/lldb-gdbserver/lldbgdbserverutils.py

def get_lldb_gdbserver_exe():
     """
     if "LLDB_DEBUGSERVER_PATH" in os.environ:
         return os.environ["LLDB_DEBUGSERVER_PATH"]
     elif "LLDB_EXEC" in os.environ:
         lldb_exe = os.environ["LLDB_EXEC"]
         if not lldb_exe:
             return None
         else:
-            return _get_debug_monitor_from_lldb(lldb_exe, "lldb-gdbserver")
+            return _get_debug_monitor_from_lldb(lldb_exe, "lldb-server")
     else:
         return None
 
 def get_debugserver_exe():
     """Return the debugserver exe path.
 
     Returns:
         A path to the debugserver exe if it is found to exist; otherwise,

lldb/trunk/tools/CMakeLists.txt

 if (CMAKE_SYSTEM_NAME MATCHES "Darwin")
   add_subdirectory(darwin-debug)
   add_subdirectory(debugserver)
 endif()
   add_subdirectory(argdumper)
   add_subdirectory(driver)
 if (NOT __ANDROID_NDK__)
   add_subdirectory(lldb-mi)
 endif()
 if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR CMAKE_SYSTEM_NAME MATCHES "Linux")
-  add_subdirectory(lldb-gdbserver)
-endif()
-if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows")
-  add_subdirectory(lldb-platform)
+  add_subdirectory(lldb-server)
 endif()

lldb/trunk/tools/Makefile

 ##===- source/Makefile -------------------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ..
 include $(LLDB_LEVEL)/../../Makefile.config
 
 DIRS :=
 
 # enable lldb-gdbserver for supported platforms
 ifneq (,$(strip $(filter $(HOST_OS), FreeBSD Linux GNU/kFreeBSD)))
-DIRS += lldb-gdbserver
-endif
-
-ifneq ($(HOST_OS),MingW)
-DIRS += lldb-platform
+DIRS += lldb-server
 endif
 
 ifeq ($(HOST_OS),Darwin)
 DIRS += debugserver
 endif
 
 ifeq ($(ENABLE_WERROR),0)
 DIRS += lldb-mi
 endif
 
 DIRS += driver
 
 include $(LLDB_LEVEL)/Makefile

lldb/trunk/tools/lldb-gdbserver/CMakeLists.txt

-set(LLVM_NO_RTTI 1)
-
-if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
-include_directories(
-  ../../source/Plugins/Process/Linux
-  ../../source/Plugins/Process/POSIX
-  )
-endif ()
-
-if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
-include_directories(
-  ../../source/Plugins/Process/FreeBSD
-  ../../source/Plugins/Process/POSIX
-  )
-endif ()
-include_directories(../../source)
-
-include(../../cmake/LLDBDependencies.cmake)
-
-if ( BUILD_SHARED_LIBS )
-  add_lldb_executable(lldb-gdbserver
-    lldb-gdbserver.cpp
-    )
-
-  target_link_libraries(lldb-gdbserver liblldb)
-else()
-  # have to include lldb and lldb-log files since those are not libraries and llgs depends on them
-  add_lldb_executable(lldb-gdbserver
-    lldb-gdbserver.cpp
-    ../../source/lldb-log.cpp
-    ../../source/lldb.cpp
-    )
-
-  # The Darwin linker doesn't understand --start-group/--end-group.
-  if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-    target_link_libraries(lldb-gdbserver
-                          -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
-  else()
-    target_link_libraries(lldb-gdbserver ${LLDB_USED_LIBS})
-  endif()
-  target_link_libraries(lldb-gdbserver ${CLANG_USED_LIBS})
-  llvm_config(lldb-gdbserver ${LLVM_LINK_COMPONENTS})
-
-  target_link_libraries(lldb-gdbserver ${LLDB_SYSTEM_LIBS})
-endif()
-
-set_target_properties(lldb-gdbserver PROPERTIES VERSION ${LLDB_VERSION})
-install(TARGETS lldb-gdbserver
-  RUNTIME DESTINATION bin)

lldb/trunk/tools/lldb-gdbserver/Makefile

-##===- tools/lldb-platform/Makefile ------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-LLDB_LEVEL := ../..
-
-TOOLNAME = lldb-gdbserver
-
-LLVMLibsOptions += -llldb -llldbUtility
-
-include $(LLDB_LEVEL)/Makefile
-
-ifeq ($(HOST_OS),Darwin)
-  LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
-  LLVMLibsOptions += -Wl,-rpath,$(LibDir)
-endif

lldb/trunk/tools/lldb-gdbserver/lldb-gdbserver.cpp

-//===-- lldb-gdbserver.cpp --------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-// C Includes
-#include <errno.h>
-#include <getopt.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifndef _WIN32
-#include <signal.h>
-#include <unistd.h>
-#endif
-
-// C++ Includes
-
-// Other libraries and framework includes
-#include "lldb/lldb-private-log.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Core/ConnectionMachPort.h"
-#include "lldb/Core/Debugger.h"
-#include "lldb/Core/PluginManager.h"
-#include "lldb/Core/StreamFile.h"
-#include "lldb/Host/ConnectionFileDescriptor.h"
-#include "lldb/Host/HostThread.h"
-#include "lldb/Host/Pipe.h"
-#include "lldb/Host/OptionParser.h"
-#include "lldb/Host/Socket.h"
-#include "lldb/Host/StringConvert.h"
-#include "lldb/Host/ThreadLauncher.h"
-#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/CommandReturnObject.h"
-#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h"
-#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
-
-#ifndef LLGS_PROGRAM_NAME
-#define LLGS_PROGRAM_NAME "lldb-gdbserver"
-#endif
-
-#ifndef LLGS_VERSION_STR
-#define LLGS_VERSION_STR "local_build"
-#endif
-
-using namespace lldb;
-using namespace lldb_private;
-
-// lldb-gdbserver state
-
-namespace
-{
-HostThread s_listen_thread;
-    std::unique_ptr<ConnectionFileDescriptor> s_listen_connection_up;
-    std::string s_listen_url;
-}
-
-//----------------------------------------------------------------------
-// option descriptors for getopt_long_only()
-//----------------------------------------------------------------------
-
-int g_debug = 0;
-int g_verbose = 0;
-
-static struct option g_long_options[] =
-{
-    { "debug",              no_argument,        &g_debug,           1   },
-    { "platform",           required_argument,  NULL,               'p' },
-    { "verbose",            no_argument,        &g_verbose,         1   },
-    { "lldb-command",       required_argument,  NULL,               'c' },
-    { "log-file",           required_argument,  NULL,               'l' },
-    { "log-flags",          required_argument,  NULL,               'f' },
-    { "attach",             required_argument,  NULL,               'a' },
-    { "named-pipe",         required_argument,  NULL,               'P' },
-    { "native-regs",        no_argument,        NULL,               'r' },  // Specify to use the native registers instead of the gdb defaults for the architecture.  NOTE: this is a do-nothing arg as it's behavior is default now.  FIXME remove call from lldb-platform.
-    { "reverse-connect",    no_argument,        NULL,               'R' },  // Specifies that llgs attaches to the client address:port rather than llgs listening for a connection from address on port.
-    { "setsid",             no_argument,        NULL,               'S' },  // Call setsid() to make llgs run in its own session.
-    { NULL,                 0,                  NULL,               0   }
-};
-
-
-//----------------------------------------------------------------------
-// Watch for signals
-//----------------------------------------------------------------------
-static int g_sigpipe_received = 0;
-static int g_sighup_received_count = 0;
-
-#ifndef _WIN32
-
-void
-signal_handler(int signo)
-{
-    Log *log (GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PROCESS));
-
-    fprintf (stderr, "lldb-gdbserver:%s received signal %d\n", __FUNCTION__, signo);
-    if (log)
-        log->Printf ("lldb-gdbserver:%s received signal %d", __FUNCTION__, signo);
-
-    switch (signo)
-    {
-    case SIGPIPE:
-        g_sigpipe_received = 1;
-        break;
-    case SIGHUP:
-        ++g_sighup_received_count;
-
-        // For now, swallow SIGHUP.
-        if (log)
-            log->Printf ("lldb-gdbserver:%s swallowing SIGHUP (receive count=%d)", __FUNCTION__, g_sighup_received_count);
-        signal (SIGHUP, signal_handler);
-        break;
-    }
-}
-#endif // #ifndef _WIN32
-
-static void
-display_usage (const char *progname)
-{
-    fprintf(stderr, "Usage:\n  %s [--log-file log-file-path] [--log-flags flags] [--lldb-command command]* [--platform platform_name] [--setsid] [--named-pipe named-pipe-path] [--native-regs] [--attach pid] [[HOST]:PORT] "
-            "[-- PROGRAM ARG1 ARG2 ...]\n", progname);
-    exit(0);
-}
-
-static void
-dump_available_platforms (FILE *output_file)
-{
-    fprintf (output_file, "Available platform plugins:\n");
-    for (int i = 0; ; ++i)
-    {
-        const char *plugin_name = PluginManager::GetPlatformPluginNameAtIndex (i);
-        const char *plugin_desc = PluginManager::GetPlatformPluginDescriptionAtIndex (i);
-
-        if (!plugin_name || !plugin_desc)
-            break;
-
-        fprintf (output_file, "%s\t%s\n", plugin_name, plugin_desc);
-    }
-
-    if ( Platform::GetHostPlatform () )
-    {
-        // add this since the default platform doesn't necessarily get registered by
-        // the plugin name (e.g. 'host' doesn't show up as a
-        // registered platform plugin even though it's the default).
-        fprintf (output_file, "%s\tDefault platform for this host.\n", Platform::GetHostPlatform ()->GetPluginName ().AsCString ());
-    }
-}
-
-static void
-run_lldb_commands (const lldb::DebuggerSP &debugger_sp, const std::vector<std::string> &lldb_commands)
-{
-    for (const auto &lldb_command : lldb_commands)
-    {
-        printf("(lldb) %s\n", lldb_command.c_str ());
-
-        lldb_private::CommandReturnObject result;
-        debugger_sp->GetCommandInterpreter ().HandleCommand (lldb_command.c_str (), eLazyBoolNo, result);
-        const char *output = result.GetOutputData ();
-        if (output && output[0])
-            puts (output);
-    }
-}
-
-static lldb::PlatformSP
-setup_platform (const std::string &platform_name)
-{
-    lldb::PlatformSP platform_sp;
-
-    if (platform_name.empty())
-    {
-        printf ("using the default platform: ");
-        platform_sp = Platform::GetHostPlatform ();
-        printf ("%s\n", platform_sp->GetPluginName ().AsCString ());
-        return platform_sp;
-    }
-
-    Error error;
-    platform_sp = Platform::Create (lldb_private::ConstString(platform_name), error);
-    if (error.Fail ())
-    {
-        // the host platform isn't registered with that name (at
-        // least, not always.  Check if the given name matches
-        // the default platform name.  If so, use it.
-        if ( Platform::GetHostPlatform () && ( Platform::GetHostPlatform ()->GetPluginName () == ConstString (platform_name.c_str()) ) )
-        {
-            platform_sp = Platform::GetHostPlatform ();
-        }
-        else
-        {
-            fprintf (stderr, "error: failed to create platform with name '%s'\n", platform_name.c_str());
-            dump_available_platforms (stderr);
-            exit (1);
-        }
-    }
-    printf ("using platform: %s\n", platform_name.c_str ());
-
-    return platform_sp;
-}
-
-void
-handle_attach_to_pid (GDBRemoteCommunicationServerLLGS &gdb_server, lldb::pid_t pid)
-{
-    Error error = gdb_server.AttachToProcess (pid);
-    if (error.Fail ())
-    {
-        fprintf (stderr, "error: failed to attach to pid %" PRIu64 ": %s\n", pid, error.AsCString());
-        exit(1);
-    }
-}
-
-void
-handle_attach_to_process_name (GDBRemoteCommunicationServerLLGS &gdb_server, const std::string &process_name)
-{
-    // FIXME implement.
-}
-
-void
-handle_attach (GDBRemoteCommunicationServerLLGS &gdb_server, const std::string &attach_target)
-{
-    assert (!attach_target.empty () && "attach_target cannot be empty");
-
-    // First check if the attach_target is convertable to a long. If so, we'll use it as a pid.
-    char *end_p = nullptr;
-    const long int pid = strtol (attach_target.c_str (), &end_p, 10);
-
-    // We'll call it a match if the entire argument is consumed.
-    if (end_p && static_cast<size_t> (end_p - attach_target.c_str ()) == attach_target.size ())
-        handle_attach_to_pid (gdb_server, static_cast<lldb::pid_t> (pid));
-    else
-        handle_attach_to_process_name (gdb_server, attach_target);
-}
-
-void
-handle_launch (GDBRemoteCommunicationServerLLGS &gdb_server, int argc, const char *const argv[])
-{
-    Error error;
-    error = gdb_server.SetLaunchArguments (argv, argc);
-    if (error.Fail ())
-    {
-        fprintf (stderr, "error: failed to set launch args for '%s': %s\n", argv[0], error.AsCString());
-        exit(1);
-    }
-
-    unsigned int launch_flags = eLaunchFlagStopAtEntry | eLaunchFlagDebug;
-
-    error = gdb_server.SetLaunchFlags (launch_flags);
-    if (error.Fail ())
-    {
-        fprintf (stderr, "error: failed to set launch flags for '%s': %s\n", argv[0], error.AsCString());
-        exit(1);
-    }
-
-    error = gdb_server.LaunchProcess ();
-    if (error.Fail ())
-    {
-        fprintf (stderr, "error: failed to launch '%s': %s\n", argv[0], error.AsCString());
-        exit(1);
-    }
-}
-
-static lldb::thread_result_t
-ListenThread (lldb::thread_arg_t /* arg */)
-{
-    Error error;
-
-    if (s_listen_connection_up)
-    {
-        // Do the listen on another thread so we can continue on...
-        if (s_listen_connection_up->Connect(s_listen_url.c_str(), &error) != eConnectionStatusSuccess)
-            s_listen_connection_up.reset();
-    }
-    return nullptr;
-}
-
-static Error
-StartListenThread (const char *hostname, uint16_t port)
-{
-    Error error;
-    if (s_listen_thread.IsJoinable())
-    {
-        error.SetErrorString("listen thread already running");
-    }
-    else
-    {
-        char listen_url[512];
-        if (hostname && hostname[0])
-            snprintf(listen_url, sizeof(listen_url), "listen://%s:%i", hostname, port);
-        else
-            snprintf(listen_url, sizeof(listen_url), "listen://%i", port);
-
-        s_listen_url = listen_url;
-        s_listen_connection_up.reset (new ConnectionFileDescriptor ());
-        s_listen_thread = ThreadLauncher::LaunchThread(listen_url, ListenThread, nullptr, &error);
-    }
-    return error;
-}
-
-static bool
-JoinListenThread ()
-{
-    if (s_listen_thread.IsJoinable())
-        s_listen_thread.Join(nullptr);
-    return true;
-}
-
-Error
-writePortToPipe (const char *const named_pipe_path, const uint16_t port)
-{
-    Pipe port_name_pipe;
-    // Wait for 10 seconds for pipe to be opened.
-    auto error = port_name_pipe.OpenAsWriterWithTimeout (named_pipe_path, false, std::chrono::microseconds (10 * 1000000));
-    if (error.Fail ())
-        return error;
-
-    char port_str[64];
-    const auto port_str_len = ::snprintf (port_str, sizeof (port_str), "%u", port);
-
-    size_t bytes_written = 0;
-    // Write the port number as a C string with the NULL terminator.
-    return port_name_pipe.Write (port_str, port_str_len + 1, bytes_written);
-}
-
-void
-ConnectToRemote (GDBRemoteCommunicationServerLLGS &gdb_server, bool reverse_connect, const char *const host_and_port, const char *const progname, const char *const named_pipe_path)
-{
-    Error error;
-
-    if (host_and_port && host_and_port[0])
-    {
-        // Parse out host and port.
-        std::string final_host_and_port;
-        std::string connection_host;
-        std::string connection_port;
-        uint32_t connection_portno = 0;
-
-        // If host_and_port starts with ':', default the host to be "localhost" and expect the remainder to be the port.
-        if (host_and_port[0] == ':')
-            final_host_and_port.append ("localhost");
-        final_host_and_port.append (host_and_port);
-
-        const std::string::size_type colon_pos = final_host_and_port.find (':');
-        if (colon_pos != std::string::npos)
-        {
-            connection_host = final_host_and_port.substr (0, colon_pos);
-            connection_port = final_host_and_port.substr (colon_pos + 1);
-            connection_portno = StringConvert::ToUInt32 (connection_port.c_str (), 0);
-        }
-        else
-        {
-            fprintf (stderr, "failed to parse host and port from connection string '%s'\n", final_host_and_port.c_str ());
-            display_usage (progname);
-            exit (1);
-        }
-
-        if (reverse_connect)
-        {
-            // llgs will connect to the gdb-remote client.
-
-            // Ensure we have a port number for the connection.
-            if (connection_portno == 0)
-            {
-                fprintf (stderr, "error: port number must be specified on when using reverse connect");
-                exit (1);
-            }
-
-            // Build the connection string.
-            char connection_url[512];
-            snprintf(connection_url, sizeof(connection_url), "connect://%s", final_host_and_port.c_str ());
-
-            // Create the connection.
-            std::unique_ptr<ConnectionFileDescriptor> connection_up (new ConnectionFileDescriptor ());
-            connection_up.reset (new ConnectionFileDescriptor ());
-            auto connection_result = connection_up->Connect (connection_url, &error);
-            if (connection_result != eConnectionStatusSuccess)
-            {
-                fprintf (stderr, "error: failed to connect to client at '%s' (connection status: %d)", connection_url, static_cast<int> (connection_result));
-                exit (-1);
-            }
-            if (error.Fail ())
-            {
-                fprintf (stderr, "error: failed to connect to client at '%s': %s", connection_url, error.AsCString ());
-                exit (-1);
-            }
-
-            // We're connected.
-            printf ("Connection established.\n");
-            gdb_server.SetConnection (connection_up.release());
-        }
-        else
-        {
-            // llgs will listen for connections on the given port from the given address.
-            // Start the listener on a new thread.  We need to do this so we can resolve the
-            // bound listener port.
-            StartListenThread(connection_host.c_str (), static_cast<uint16_t> (connection_portno));
-            printf ("Listening to port %s for a connection from %s...\n", connection_port.c_str (), connection_host.c_str ());
-
-            // If we have a named pipe to write the port number back to, do that now.
-            if (named_pipe_path && named_pipe_path[0] && connection_portno == 0)
-            {
-                const uint16_t bound_port = s_listen_connection_up->GetListeningPort (10);
-                if (bound_port > 0)
-                {
-                    error = writePortToPipe (named_pipe_path, bound_port);
-                    if (error.Fail ())
-                    {
-                        fprintf (stderr, "failed to write to the named pipe \'%s\': %s", named_pipe_path, error.AsCString());
-                    }
-                }
-                else
-                {
-                    fprintf (stderr, "unable to get the bound port for the listening connection\n");
-                }
-            }
-
-            // Join the listener thread.
-            if (!JoinListenThread ())
-            {
-                fprintf (stderr, "failed to join the listener thread\n");
-                display_usage (progname);
-                exit (1);
-            }
-
-            // Ensure we connected.
-            if (s_listen_connection_up)
-            {
-                printf ("Connection established '%s'\n", s_listen_connection_up->GetURI().c_str());
-                gdb_server.SetConnection (s_listen_connection_up.release());
-            }
-            else
-            {
-                fprintf (stderr, "failed to connect to '%s': %s\n", final_host_and_port.c_str (), error.AsCString ());
-                display_usage (progname);
-                exit (1);
-            }
-        }
-    }
-
-    if (gdb_server.IsConnected())
-    {
-        // After we connected, we need to get an initial ack from...
-        if (gdb_server.HandshakeWithClient(&error))
-        {
-            // We'll use a half a second timeout interval so that an exit conditions can
-            // be checked that often.
-            const uint32_t TIMEOUT_USEC = 500000;
-
-            bool interrupt = false;
-            bool done = false;
-            while (!interrupt && !done && (g_sighup_received_count < 2))
-            {
-                const GDBRemoteCommunication::PacketResult result = gdb_server.GetPacketAndSendResponse (TIMEOUT_USEC, error, interrupt, done);
-                if ((result != GDBRemoteCommunication::PacketResult::Success) &&
-                    (result != GDBRemoteCommunication::PacketResult::ErrorReplyTimeout))
-                {
-                    // We're bailing out - we only support successful handling and timeouts.
-                    fprintf(stderr, "leaving packet loop due to PacketResult %d\n", result);
-                    break;
-                }
-            }
-
-            if (error.Fail())
-            {
-                fprintf(stderr, "error: %s\n", error.AsCString());
-            }
-        }
-        else
-        {
-            fprintf(stderr, "error: handshake with client failed\n");
-        }
-    }
-    else
-    {
-        fprintf (stderr, "no connection information provided, unable to run\n");
-        display_usage (progname);
-        exit (1);
-    }
-}
-
-//----------------------------------------------------------------------
-// main
-//----------------------------------------------------------------------
-int
-main (int argc, char *argv[])
-{
-#ifndef _WIN32
-    // Setup signal handlers first thing.
-    signal (SIGPIPE, signal_handler);
-    signal (SIGHUP, signal_handler);
-#endif
-
-    const char *progname = argv[0];
-    int long_option_index = 0;
-    StreamSP log_stream_sp;
-    Args log_args;
-    Error error;
-    int ch;
-    std::string platform_name;
-    std::string attach_target;
-    std::string named_pipe_path;
-    bool reverse_connect = false;
-
-    Debugger::Initialize (NULL);
-
-    lldb::DebuggerSP debugger_sp = Debugger::CreateInstance ();
-
-    debugger_sp->SetInputFileHandle(stdin, false);
-    debugger_sp->SetOutputFileHandle(stdout, false);
-    debugger_sp->SetErrorFileHandle(stderr, false);
-
-    // ProcessLaunchInfo launch_info;
-    ProcessAttachInfo attach_info;
-
-    bool show_usage = false;
-    int option_error = 0;
-#if __GLIBC__
-    optind = 0;
-#else
-    optreset = 1;
-    optind = 1;
-#endif
-
-    std::string short_options(OptionParser::GetShortOptionString(g_long_options));
-
-    std::vector<std::string> lldb_commands;
-
-    while ((ch = getopt_long_only(argc, argv, short_options.c_str(), g_long_options, &long_option_index)) != -1)
-    {
-        switch (ch)
-        {
-        case 0:   // Any optional that auto set themselves will return 0
-            break;
-
-        case 'l': // Set Log File
-            if (optarg && optarg[0])
-            {
-                if ((strcasecmp(optarg, "stdout") == 0) || (strcmp(optarg, "/dev/stdout") == 0))
-                {
-                    log_stream_sp.reset (new StreamFile (stdout, false));
-                }
-                else if ((strcasecmp(optarg, "stderr") == 0) || (strcmp(optarg, "/dev/stderr") == 0))
-                {
-                    log_stream_sp.reset (new StreamFile (stderr, false));
-                }
-                else
-                {
-                    FILE *log_file = fopen(optarg, "w");
-                    if (log_file)
-                    {
-                        setlinebuf(log_file);
-                        log_stream_sp.reset (new StreamFile (log_file, true));
-                    }
-                    else
-                    {
-                        const char *errno_str = strerror(errno);
-                        fprintf (stderr, "Failed to open log file '%s' for writing: errno = %i (%s)", optarg, errno, errno_str ? errno_str : "unknown error");
-                    }
-
-                }
-            }
-            break;
-
-        case 'f': // Log Flags
-            if (optarg && optarg[0])
-                log_args.AppendArgument(optarg);
-            break;
-
-        case 'c': // lldb commands
-            if (optarg && optarg[0])
-                lldb_commands.push_back(optarg);
-            break;
-
-        case 'p': // platform name
-            if (optarg && optarg[0])
-                platform_name = optarg;
-            break;
-
-        case 'P': // named pipe
-            if (optarg && optarg[0])
-                named_pipe_path = optarg;
-            break;
-
-        case 'r':
-            // Do nothing, native regs is the default these days
-            break;
-
-        case 'R':
-            reverse_connect = true;
-            break;
-
-#ifndef _WIN32
-        case 'S':
-            // Put llgs into a new session. Terminals group processes
-            // into sessions and when a special terminal key sequences
-            // (like control+c) are typed they can cause signals to go out to
-            // all processes in a session. Using this --setsid (-S) option
-            // will cause debugserver to run in its own sessions and be free
-            // from such issues.
-            //
-            // This is useful when llgs is spawned from a command
-            // line application that uses llgs to do the debugging,
-            // yet that application doesn't want llgs receiving the
-            // signals sent to the session (i.e. dying when anyone hits ^C).
-            {
-                const ::pid_t new_sid = setsid();
-                if (new_sid == -1)
-                {
-                    const char *errno_str = strerror(errno);
-                    fprintf (stderr, "failed to set new session id for %s (%s)\n", LLGS_PROGRAM_NAME, errno_str ? errno_str : "<no error string>");
-                }
-            }
-            break;
-#endif
-
-        case 'a': // attach {pid|process_name}
-            if (optarg && optarg[0])
-                attach_target = optarg;
-                break;
-
-        case 'h':   /* fall-through is intentional */
-        case '?':
-            show_usage = true;
-            break;
-        }
-    }
-
-    if (show_usage || option_error)
-    {
-        display_usage(progname);
-        exit(option_error);
-    }
-
-    if (log_stream_sp)
-    {
-        if (log_args.GetArgumentCount() == 0)
-            log_args.AppendArgument("default");
-        ProcessGDBRemoteLog::EnableLog (log_stream_sp, 0,log_args.GetConstArgumentVector(), log_stream_sp.get());
-    }
-    Log *log(lldb_private::GetLogIfAnyCategoriesSet (GDBR_LOG_VERBOSE));
-    if (log)
-    {
-        log->Printf ("lldb-gdbserver launch");
-        for (int i = 0; i < argc; i++)
-        {
-            log->Printf ("argv[%i] = '%s'", i, argv[i]);
-        }
-    }
-
-    // Skip any options we consumed with getopt_long_only.
-    argc -= optind;
-    argv += optind;
-
-    if (argc == 0)
-    {
-        display_usage(progname);
-        exit(255);
-    }
-
-    // Run any commands requested.
-    run_lldb_commands (debugger_sp, lldb_commands);
-
-    // Setup the platform that GDBRemoteCommunicationServerLLGS will use.
-    lldb::PlatformSP platform_sp = setup_platform (platform_name);
-
-    GDBRemoteCommunicationServerLLGS gdb_server (platform_sp, debugger_sp);
-
-    const char *const host_and_port = argv[0];
-    argc -= 1;
-    argv += 1;
-
-    // Any arguments left over are for the the program that we need to launch. If there
-    // are no arguments, then the GDB server will start up and wait for an 'A' packet
-    // to launch a program, or a vAttach packet to attach to an existing process, unless
-    // explicitly asked to attach with the --attach={pid|program_name} form.
-    if (!attach_target.empty ())
-        handle_attach (gdb_server, attach_target);
-    else if (argc > 0)
-        handle_launch (gdb_server, argc, argv);
-
-    // Print version info.
-    printf("%s-%s", LLGS_PROGRAM_NAME, LLGS_VERSION_STR);
-
-    ConnectToRemote (gdb_server, reverse_connect, host_and_port, progname, named_pipe_path.c_str ());
-
-    Debugger::Terminate ();
-
-    fprintf(stderr, "lldb-gdbserver exiting...\n");
-
-    return 0;
-}

lldb/trunk/tools/lldb-platform/CMakeLists.txt

-set(LLVM_NO_RTTI 1)
-
-if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
-include_directories(
-  ../../source/Plugins/Process/Linux
-  ../../source/Plugins/Process/POSIX
-  )
-endif ()
-
-if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
-include_directories(
-  ../../source/Plugins/Process/FreeBSD
-  ../../source/Plugins/Process/POSIX
-  )
-endif ()
-
-include_directories(../../source)
-
-include(../../cmake/LLDBDependencies.cmake)
-
-add_lldb_executable(lldb-platform
-  lldb-platform.cpp
-  ../../source/lldb-log.cpp
-  ../../source/lldb.cpp
-  ${LLDB_WRAP_PYTHON}
-  ${LLDB_VERS_GENERATED_FILE}
-  )
-
-if (LLDB_WRAP_PYTHON OR LLDB_VERS_GENERATED_FILE)
-  add_dependencies(lldb-platform swig_wrapper)
-endif()
-
-# The Darwin linker doesn't understand --start-group/--end-group.
-if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
-  target_link_libraries(lldb-platform
-                        -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
-else()
-  target_link_libraries(lldb-platform ${LLDB_USED_LIBS})
-endif()
-target_link_libraries(lldb-platform ${CLANG_USED_LIBS})
-llvm_config(lldb-platform ${LLVM_LINK_COMPONENTS})
-
-target_link_libraries(lldb-platform ${LLDB_SYSTEM_LIBS})
-
-set_target_properties(lldb-platform PROPERTIES VERSION ${LLDB_VERSION})
-
-install(TARGETS lldb-platform
-  RUNTIME DESTINATION bin)

lldb/trunk/tools/lldb-platform/Makefile

-##===- tools/lldb-platform/Makefile ------------------------*- Makefile -*-===##
-#
-#                     The LLVM Compiler Infrastructure
-#
-# This file is distributed under the University of Illinois Open Source
-# License. See LICENSE.TXT for details.
-#
-##===----------------------------------------------------------------------===##
-LLDB_LEVEL := ../..
-
-TOOLNAME = lldb-platform
-
-LLVMLibsOptions += -llldb -llldbUtility
-
-include $(LLDB_LEVEL)/Makefile
-
-ifeq ($(HOST_OS),Darwin)
-  LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/
-endif
-
-ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
-  LLVMLibsOptions += -Wl,-rpath,$(LibDir)
-endif

lldb/trunk/tools/lldb-platform/lldb-platform.cpp

-//===-- lldb-platform.cpp ---------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include "lldb/lldb-python.h"
-
-// C Includes
-#include <errno.h>
-#if defined(__APPLE__)
-#include <netinet/in.h>
-#endif
-#include <signal.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-// C++ Includes
-
-// Other libraries and framework includes
-#include "lldb/lldb-private-log.h"
-#include "lldb/Core/Error.h"
-#include "lldb/Core/ConnectionMachPort.h"
-#include "lldb/Core/Debugger.h"
-#include "lldb/Core/StreamFile.h"
-#include "lldb/Host/ConnectionFileDescriptor.h"
-#include "lldb/Host/HostGetOpt.h"
-#include "lldb/Host/OptionParser.h"
-#include "lldb/Interpreter/CommandInterpreter.h"
-#include "lldb/Interpreter/CommandReturnObject.h"
-#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h"
-#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
-
-using namespace lldb;
-using namespace lldb_private;
-
-//----------------------------------------------------------------------
-// option descriptors for getopt_long_only()
-//----------------------------------------------------------------------
-
-int g_debug = 0;
-int g_verbose = 0;
-int g_stay_alive = 0;
-
-static struct option g_long_options[] =
-{
-    { "debug",              no_argument,        &g_debug,           1   },
-    { "verbose",            no_argument,        &g_verbose,         1   },
-    { "stay-alive",         no_argument,        &g_stay_alive,      1   },
-    { "listen",             required_argument,  NULL,               'L' },
-    { "port-offset",        required_argument,  NULL,               'p' },
-    { "gdbserver-port",     required_argument,  NULL,               'P' },
-    { "min-gdbserver-port", required_argument,  NULL,               'm' },
-    { "max-gdbserver-port", required_argument,  NULL,               'M' },
-    { "lldb-command",       required_argument,  NULL,               'c' },
-    { NULL,                 0,                  NULL,               0   }
-};
-
-#if defined (__APPLE__)
-#define LOW_PORT    (IPPORT_RESERVED)
-#define HIGH_PORT   (IPPORT_HIFIRSTAUTO)
-#else
-#define LOW_PORT    (1024u)
-#define HIGH_PORT   (49151u)
-#endif
-
-
-//----------------------------------------------------------------------
-// Watch for signals
-//----------------------------------------------------------------------
-void
-signal_handler(int signo)
-{
-    switch (signo)
-    {
-    case SIGHUP:
-        // Use SIGINT first, if that does not work, use SIGHUP as a last resort.
-        // And we should not call exit() here because it results in the global destructors
-        // to be invoked and wreaking havoc on the threads still running.
-        Host::SystemLog(Host::eSystemLogWarning, "SIGHUP received, exiting lldb-platform...\n");
-        abort();
-        break;
-    }
-}
-
-static void
-display_usage (const char *progname)
-{
-    fprintf(stderr, "Usage:\n  %s [--log-file log-file-path] [--log-flags flags] --listen port\n", progname);
-    exit(0);
-}
-
-//----------------------------------------------------------------------
-// main
-//----------------------------------------------------------------------
-int
-main (int argc, char *argv[])
-{
-    const char *progname = argv[0];
-    signal (SIGPIPE, SIG_IGN);
-    signal (SIGHUP, signal_handler);
-    int long_option_index = 0;
-    Error error;
-    std::string listen_host_port;
-    int ch;
-    Debugger::Initialize(NULL);
-
-    lldb::DebuggerSP debugger_sp = Debugger::CreateInstance ();
-
-    debugger_sp->SetInputFileHandle(stdin, false);
-    debugger_sp->SetOutputFileHandle(stdout, false);
-    debugger_sp->SetErrorFileHandle(stderr, false);
-    
-    GDBRemoteCommunicationServerPlatform::PortMap gdbserver_portmap;
-    int min_gdbserver_port = 0;
-    int max_gdbserver_port = 0;
-    uint16_t port_offset = 0;
-    
-    std::vector<std::string> lldb_commands;
-    bool show_usage = false;
-    int option_error = 0;
-    
-    std::string short_options(OptionParser::GetShortOptionString(g_long_options));
-                            
-#if __GLIBC__
-    optind = 0;
-#else
-    optreset = 1;
-    optind = 1;
-#endif
-
-    while ((ch = getopt_long_only(argc, argv, short_options.c_str(), g_long_options, &long_option_index)) != -1)
-    {
-        switch (ch)
-        {
-        case 0:   // Any optional that auto set themselves will return 0
-            break;
-
-        case 'L':
-            listen_host_port.append (optarg);
-            break;
-
-        case 'p':
-            {
-                char *end = NULL;
-                long tmp_port_offset = strtoul(optarg, &end, 0);
-                if (end && *end == '\0')
-                {
-                    if (LOW_PORT <= tmp_port_offset && tmp_port_offset <= HIGH_PORT)
-                    {
-                        port_offset = (uint16_t)tmp_port_offset;
-                    }
-                    else
-                    {
-                        fprintf (stderr, "error: port offset %li is not in the valid user port range of %u - %u\n", tmp_port_offset, LOW_PORT, HIGH_PORT);
-                        option_error = 5;
-                    }
-                }
-                else
-                {
-                    fprintf (stderr, "error: invalid port offset string %s\n", optarg);
-                    option_error = 4;
-                }
-            }
-            break;
-                
-        case 'P':
-        case 'm':
-        case 'M':
-            {
-                char *end = NULL;
-                long portnum = strtoul(optarg, &end, 0);
-                if (end && *end == '\0')
-                {
-                    if (LOW_PORT <= portnum && portnum <= HIGH_PORT)
-                    {
-                        if (ch  == 'P')
-                            gdbserver_portmap[(uint16_t)portnum] = LLDB_INVALID_PROCESS_ID;
-                        else if (ch == 'm')
-                            min_gdbserver_port = portnum;
-                        else
-                            max_gdbserver_port = portnum;
-                    }
-                    else
-                    {
-                        fprintf (stderr, "error: port number %li is not in the valid user port range of %u - %u\n", portnum, LOW_PORT, HIGH_PORT);
-                        option_error = 1;
-                    }
-                }
-                else
-                {
-                    fprintf (stderr, "error: invalid port number string %s\n", optarg);
-                    option_error = 2;
-                }
-            }
-            break;
-            
-        case 'c':
-            lldb_commands.push_back(optarg);
-            break;
-
-        case 'h':   /* fall-through is intentional */
-        case '?':
-            show_usage = true;
-            break;
-        }
-    }
-
-    // Make a port map for a port range that was specified.
-    if (min_gdbserver_port < max_gdbserver_port)
-    {
-        for (uint16_t port = min_gdbserver_port; port < max_gdbserver_port; ++port)
-            gdbserver_portmap[port] = LLDB_INVALID_PROCESS_ID;
-    }
-    else if (min_gdbserver_port != max_gdbserver_port)
-    {
-        fprintf (stderr, "error: --min-gdbserver-port (%u) is greater than --max-gdbserver-port (%u)\n", min_gdbserver_port, max_gdbserver_port);
-        option_error = 3;
-        
-    }
-
-    // Print usage and exit if no listening port is specified.
-    if (listen_host_port.empty())
-        show_usage = true;
-    
-    if (show_usage || option_error)
-    {
-        display_usage(progname);
-        exit(option_error);
-    }
-    
-    // Execute any LLDB commands that we were asked to evaluate.
-    for (const auto &lldb_command : lldb_commands)
-    {
-        lldb_private::CommandReturnObject result;
-        printf("(lldb) %s\n", lldb_command.c_str());
-        debugger_sp->GetCommandInterpreter().HandleCommand(lldb_command.c_str(), eLazyBoolNo, result);
-        const char *output = result.GetOutputData();
-        if (output && output[0])
-            puts(output);
-    }
-
-
-    do {
-        GDBRemoteCommunicationServerPlatform platform;
-        
-        if (port_offset > 0)
-            platform.SetPortOffset(port_offset);
-
-        if (!gdbserver_portmap.empty())
-        {
-            platform.SetPortMap(std::move(gdbserver_portmap));
-        }
-
-        if (!listen_host_port.empty())
-        {
-            std::unique_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor());
-            if (conn_ap.get())
-            {
-                std::string connect_url ("listen://");
-                connect_url.append(listen_host_port.c_str());
-
-                printf ("Listening for a connection from %s...\n", listen_host_port.c_str());
-                if (conn_ap->Connect(connect_url.c_str(), &error) == eConnectionStatusSuccess)
-                {
-                    printf ("Connection established.\n");
-                    platform.SetConnection (conn_ap.release());
-                }
-                else
-                {
-                    printf ("error: %s\n", error.AsCString());
-                }
-            }
-
-            if (platform.IsConnected())
-            {
-                // After we connected, we need to get an initial ack from...
-                if (platform.HandshakeWithClient(&error))
-                {
-                    bool interrupt = false;
-                    bool done = false;
-                    while (!interrupt && !done)
-                    {
-                        if (platform.GetPacketAndSendResponse (UINT32_MAX, error, interrupt, done) != GDBRemoteCommunication::PacketResult::Success)
-                            break;
-                    }
-                    
-                    if (error.Fail())
-                    {
-                        fprintf(stderr, "error: %s\n", error.AsCString());
-                    }
-                }
-                else
-                {
-                    fprintf(stderr, "error: handshake with client failed\n");
-                }
-            }
-        }
-    } while (g_stay_alive);
-
-    Debugger::Terminate();
-
-    fprintf(stderr, "lldb-platform exiting...\n");
-
-    return 0;
-}

lldb/trunk/tools/lldb-server/CMakeLists.txt

+set(LLVM_NO_RTTI 1)
+
+if ( CMAKE_SYSTEM_NAME MATCHES "Linux" )
+include_directories(
+  ../../source/Plugins/Process/Linux
+  ../../source/Plugins/Process/POSIX
+  )
+endif ()
+
+if ( CMAKE_SYSTEM_NAME MATCHES "FreeBSD" )
+include_directories(
+  ../../source/Plugins/Process/FreeBSD
+  ../../source/Plugins/Process/POSIX
+  )
+endif ()
+
+include_directories(../../source)
+
+include(../../cmake/LLDBDependencies.cmake)
+
+if (BUILD_SHARED_LIBS )
+  add_lldb_executable(lldb-server
+    lldb-server.cpp
+    lldb-gdbserver.cpp
+    lldb-platform.cpp
+    )
+
+  target_link_libraries(lldb-server liblldb)
+else()
+  add_lldb_executable(lldb-server
+    lldb-server.cpp
+    lldb-gdbserver.cpp
+    lldb-platform.cpp
+    ../../source/lldb-log.cpp
+    ../../source/lldb.cpp
+    )
+
+  # The Darwin linker doesn't understand --start-group/--end-group.
+  if (LLVM_COMPILER_IS_GCC_COMPATIBLE AND NOT "${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
+    target_link_libraries(lldb-server
+                          -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group)
+  else()
+    target_link_libraries(lldb-server ${LLDB_USED_LIBS})
+  endif()
+  target_link_libraries(lldb-server ${CLANG_USED_LIBS})
+  llvm_config(lldb-server ${LLVM_LINK_COMPONENTS})
+
+  target_link_libraries(lldb-server ${LLDB_SYSTEM_LIBS})
+endif()
+
+set_target_properties(lldb-server PROPERTIES VERSION ${LLDB_VERSION})
+
+install(TARGETS lldb-server
+  RUNTIME DESTINATION bin)

lldb/trunk/tools/lldb-server/Makefile

+##===- tools/lldb-server/Makefile ------------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+LLDB_LEVEL := ../..
+
+TOOLNAME = lldb-server
+
+LLVMLibsOptions += -llldb -llldbUtility
+
+include $(LLDB_LEVEL)/Makefile
+
+ifeq ($(HOST_OS),Darwin)
+  LLVMLibsOptions += -Wl,-rpath,@loader_path/../lib/
+endif
+
+ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux FreeBSD GNU/kFreeBSD))
+  LLVMLibsOptions += -Wl,-rpath,$(LibDir)
+endif

lldb/trunk/tools/lldb-server/lldb-gdbserver.cpp

+//===-- lldb-gdbserver.cpp --------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// C Includes
+#include <errno.h>
+#include <getopt.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#ifndef _WIN32
+#include <signal.h>
+#include <unistd.h>
+#endif
+
+// C++ Includes
+
+// Other libraries and framework includes
+#include "lldb/lldb-private-log.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Core/ConnectionMachPort.h"
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/PluginManager.h"
+#include "lldb/Core/StreamFile.h"
+#include "lldb/Host/ConnectionFileDescriptor.h"
+#include "lldb/Host/HostThread.h"
+#include "lldb/Host/Pipe.h"
+#include "lldb/Host/OptionParser.h"
+#include "lldb/Host/Socket.h"
+#include "lldb/Host/StringConvert.h"
+#include "lldb/Host/ThreadLauncher.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/CommandReturnObject.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h"
+#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+
+#ifndef LLGS_PROGRAM_NAME
+#define LLGS_PROGRAM_NAME "lldb-gdbserver"
+#endif
+
+#ifndef LLGS_VERSION_STR
+#define LLGS_VERSION_STR "local_build"
+#endif
+
+using namespace lldb;
+using namespace lldb_private;
+
+// lldb-gdbserver state
+
+namespace
+{
+HostThread s_listen_thread;
+    std::unique_ptr<ConnectionFileDescriptor> s_listen_connection_up;
+    std::string s_listen_url;
+}
+
+//----------------------------------------------------------------------
+// option descriptors for getopt_long_only()
+//----------------------------------------------------------------------
+
+static int g_debug = 0;
+static int g_verbose = 0;
+
+static struct option g_long_options[] =
+{
+    { "debug",              no_argument,        &g_debug,           1   },
+    { "platform",           required_argument,  NULL,               'p' },
+    { "verbose",            no_argument,        &g_verbose,         1   },
+    { "lldb-command",       required_argument,  NULL,               'c' },
+    { "log-file",           required_argument,  NULL,               'l' },
+    { "log-flags",          required_argument,  NULL,               'f' },
+    { "attach",             required_argument,  NULL,               'a' },
+    { "named-pipe",         required_argument,  NULL,               'P' },
+    { "native-regs",        no_argument,        NULL,               'r' },  // Specify to use the native registers instead of the gdb defaults for the architecture.  NOTE: this is a do-nothing arg as it's behavior is default now.  FIXME remove call from lldb-platform.
+    { "reverse-connect",    no_argument,        NULL,               'R' },  // Specifies that llgs attaches to the client address:port rather than llgs listening for a connection from address on port.
+    { "setsid",             no_argument,        NULL,               'S' },  // Call setsid() to make llgs run in its own session.
+    { NULL,                 0,                  NULL,               0   }
+};
+
+
+//----------------------------------------------------------------------
+// Watch for signals
+//----------------------------------------------------------------------
+static int g_sigpipe_received = 0;
+static int g_sighup_received_count = 0;
+
+#ifndef _WIN32
+
+static void
+signal_handler(int signo)
+{
+    Log *log (GetLogIfAnyCategoriesSet(LIBLLDB_LOG_PROCESS));
+
+    fprintf (stderr, "lldb-gdbserver:%s received signal %d\n", __FUNCTION__, signo);
+    if (log)
+        log->Printf ("lldb-gdbserver:%s received signal %d", __FUNCTION__, signo);
+
+    switch (signo)
+    {
+    case SIGPIPE:
+        g_sigpipe_received = 1;
+        break;
+    case SIGHUP:
+        ++g_sighup_received_count;
+
+        // For now, swallow SIGHUP.
+        if (log)
+            log->Printf ("lldb-gdbserver:%s swallowing SIGHUP (receive count=%d)", __FUNCTION__, g_sighup_received_count);
+        signal (SIGHUP, signal_handler);
+        break;
+    }
+}
+#endif // #ifndef _WIN32
+
+static void
+display_usage (const char *progname, const char* subcommand)
+{
+    fprintf(stderr, "Usage:\n  %s %s [--log-file log-file-path] [--log-flags flags] [--lldb-command command]* [--platform platform_name] [--setsid] [--named-pipe named-pipe-path] [--native-regs] [--attach pid] [[HOST]:PORT] "
+            "[-- PROGRAM ARG1 ARG2 ...]\n", progname, subcommand);
+    exit(0);
+}
+
+static void
+dump_available_platforms (FILE *output_file)
+{
+    fprintf (output_file, "Available platform plugins:\n");
+    for (int i = 0; ; ++i)
+    {
+        const char *plugin_name = PluginManager::GetPlatformPluginNameAtIndex (i);
+        const char *plugin_desc = PluginManager::GetPlatformPluginDescriptionAtIndex (i);
+
+        if (!plugin_name || !plugin_desc)
+            break;
+
+        fprintf (output_file, "%s\t%s\n", plugin_name, plugin_desc);
+    }
+
+    if ( Platform::GetHostPlatform () )
+    {
+        // add this since the default platform doesn't necessarily get registered by
+        // the plugin name (e.g. 'host' doesn't show up as a
+        // registered platform plugin even though it's the default).
+        fprintf (output_file, "%s\tDefault platform for this host.\n", Platform::GetHostPlatform ()->GetPluginName ().AsCString ());
+    }
+}
+
+static void
+run_lldb_commands (const lldb::DebuggerSP &debugger_sp, const std::vector<std::string> &lldb_commands)
+{
+    for (const auto &lldb_command : lldb_commands)
+    {
+        printf("(lldb) %s\n", lldb_command.c_str ());
+
+        lldb_private::CommandReturnObject result;
+        debugger_sp->GetCommandInterpreter ().HandleCommand (lldb_command.c_str (), eLazyBoolNo, result);
+        const char *output = result.GetOutputData ();
+        if (output && output[0])
+            puts (output);
+    }
+}
+
+static lldb::PlatformSP
+setup_platform (const std::string &platform_name)
+{
+    lldb::PlatformSP platform_sp;
+
+    if (platform_name.empty())
+    {
+        printf ("using the default platform: ");
+        platform_sp = Platform::GetHostPlatform ();
+        printf ("%s\n", platform_sp->GetPluginName ().AsCString ());
+        return platform_sp;
+    }
+
+    Error error;
+    platform_sp = Platform::Create (lldb_private::ConstString(platform_name), error);
+    if (error.Fail ())
+    {
+        // the host platform isn't registered with that name (at
+        // least, not always.  Check if the given name matches
+        // the default platform name.  If so, use it.
+        if ( Platform::GetHostPlatform () && ( Platform::GetHostPlatform ()->GetPluginName () == ConstString (platform_name.c_str()) ) )
+        {
+            platform_sp = Platform::GetHostPlatform ();
+        }
+        else
+        {
+            fprintf (stderr, "error: failed to create platform with name '%s'\n", platform_name.c_str());
+            dump_available_platforms (stderr);
+            exit (1);
+        }
+    }
+    printf ("using platform: %s\n", platform_name.c_str ());
+
+    return platform_sp;
+}
+
+void
+handle_attach_to_pid (GDBRemoteCommunicationServerLLGS &gdb_server, lldb::pid_t pid)
+{
+    Error error = gdb_server.AttachToProcess (pid);
+    if (error.Fail ())
+    {
+        fprintf (stderr, "error: failed to attach to pid %" PRIu64 ": %s\n", pid, error.AsCString());
+        exit(1);
+    }
+}
+
+void
+handle_attach_to_process_name (GDBRemoteCommunicationServerLLGS &gdb_server, const std::string &process_name)
+{
+    // FIXME implement.
+}
+
+void
+handle_attach (GDBRemoteCommunicationServerLLGS &gdb_server, const std::string &attach_target)
+{
+    assert (!attach_target.empty () && "attach_target cannot be empty");
+
+    // First check if the attach_target is convertable to a long. If so, we'll use it as a pid.
+    char *end_p = nullptr;
+    const long int pid = strtol (attach_target.c_str (), &end_p, 10);
+
+    // We'll call it a match if the entire argument is consumed.
+    if (end_p && static_cast<size_t> (end_p - attach_target.c_str ()) == attach_target.size ())
+        handle_attach_to_pid (gdb_server, static_cast<lldb::pid_t> (pid));
+    else
+        handle_attach_to_process_name (gdb_server, attach_target);
+}
+
+void
+handle_launch (GDBRemoteCommunicationServerLLGS &gdb_server, int argc, const char *const argv[])
+{
+    Error error;
+    error = gdb_server.SetLaunchArguments (argv, argc);
+    if (error.Fail ())
+    {
+        fprintf (stderr, "error: failed to set launch args for '%s': %s\n", argv[0], error.AsCString());
+        exit(1);
+    }
+
+    unsigned int launch_flags = eLaunchFlagStopAtEntry | eLaunchFlagDebug;
+
+    error = gdb_server.SetLaunchFlags (launch_flags);
+    if (error.Fail ())
+    {
+        fprintf (stderr, "error: failed to set launch flags for '%s': %s\n", argv[0], error.AsCString());
+        exit(1);
+    }
+
+    error = gdb_server.LaunchProcess ();
+    if (error.Fail ())
+    {
+        fprintf (stderr, "error: failed to launch '%s': %s\n", argv[0], error.AsCString());
+        exit(1);
+    }
+}
+
+static lldb::thread_result_t
+ListenThread (lldb::thread_arg_t /* arg */)
+{
+    Error error;
+
+    if (s_listen_connection_up)
+    {
+        // Do the listen on another thread so we can continue on...
+        if (s_listen_connection_up->Connect(s_listen_url.c_str(), &error) != eConnectionStatusSuccess)
+            s_listen_connection_up.reset();
+    }
+    return nullptr;
+}
+
+static Error
+StartListenThread (const char *hostname, uint16_t port)
+{
+    Error error;
+    if (s_listen_thread.IsJoinable())
+    {
+        error.SetErrorString("listen thread already running");
+    }
+    else
+    {
+        char listen_url[512];
+        if (hostname && hostname[0])
+            snprintf(listen_url, sizeof(listen_url), "listen://%s:%i", hostname, port);
+        else
+            snprintf(listen_url, sizeof(listen_url), "listen://%i", port);
+
+        s_listen_url = listen_url;
+        s_listen_connection_up.reset (new ConnectionFileDescriptor ());
+        s_listen_thread = ThreadLauncher::LaunchThread(listen_url, ListenThread, nullptr, &error);
+    }
+    return error;
+}
+
+static bool
+JoinListenThread ()
+{
+    if (s_listen_thread.IsJoinable())
+        s_listen_thread.Join(nullptr);
+    return true;
+}
+
+Error
+writePortToPipe (const char *const named_pipe_path, const uint16_t port)
+{
+    Pipe port_name_pipe;
+    // Wait for 10 seconds for pipe to be opened.
+    auto error = port_name_pipe.OpenAsWriterWithTimeout (named_pipe_path, false, std::chrono::microseconds (10 * 1000000));
+    if (error.Fail ())
+        return error;
+
+    char port_str[64];
+    const auto port_str_len = ::snprintf (port_str, sizeof (port_str), "%u", port);
+
+    size_t bytes_written = 0;
+    // Write the port number as a C string with the NULL terminator.
+    return port_name_pipe.Write (port_str, port_str_len + 1, bytes_written);
+}
+
+void
+ConnectToRemote (GDBRemoteCommunicationServerLLGS &gdb_server, bool reverse_connect, const char *const host_and_port, const char *const progname, const char *const subcommand, const char *const named_pipe_path)
+{
+    Error error;
+
+    if (host_and_port && host_and_port[0])
+    {
+        // Parse out host and port.
+        std::string final_host_and_port;
+        std::string connection_host;
+        std::string connection_port;
+        uint32_t connection_portno = 0;
+
+        // If host_and_port starts with ':', default the host to be "localhost" and expect the remainder to be the port.
+        if (host_and_port[0] == ':')
+            final_host_and_port.append ("localhost");
+        final_host_and_port.append (host_and_port);
+
+        const std::string::size_type colon_pos = final_host_and_port.find (':');
+        if (colon_pos != std::string::npos)
+        {
+            connection_host = final_host_and_port.substr (0, colon_pos);
+            connection_port = final_host_and_port.substr (colon_pos + 1);
+            connection_portno = StringConvert::ToUInt32 (connection_port.c_str (), 0);
+        }
+        else
+        {
+            fprintf (stderr, "failed to parse host and port from connection string '%s'\n", final_host_and_port.c_str ());
+            display_usage (progname, subcommand);
+            exit (1);
+        }
+
+        if (reverse_connect)
+        {
+            // llgs will connect to the gdb-remote client.
+
+            // Ensure we have a port number for the connection.
+            if (connection_portno == 0)
+            {
+                fprintf (stderr, "error: port number must be specified on when using reverse connect");
+                exit (1);
+            }
+
+            // Build the connection string.
+            char connection_url[512];
+            snprintf(connection_url, sizeof(connection_url), "connect://%s", final_host_and_port.c_str ());
+
+            // Create the connection.
+            std::unique_ptr<ConnectionFileDescriptor> connection_up (new ConnectionFileDescriptor ());
+            connection_up.reset (new ConnectionFileDescriptor ());
+            auto connection_result = connection_up->Connect (connection_url, &error);
+            if (connection_result != eConnectionStatusSuccess)
+            {
+                fprintf (stderr, "error: failed to connect to client at '%s' (connection status: %d)", connection_url, static_cast<int> (connection_result));
+                exit (-1);
+            }
+            if (error.Fail ())
+            {
+                fprintf (stderr, "error: failed to connect to client at '%s': %s", connection_url, error.AsCString ());
+                exit (-1);
+            }
+
+            // We're connected.
+            printf ("Connection established.\n");
+            gdb_server.SetConnection (connection_up.release());
+        }
+        else
+        {
+            // llgs will listen for connections on the given port from the given address.
+            // Start the listener on a new thread.  We need to do this so we can resolve the
+            // bound listener port.
+            StartListenThread(connection_host.c_str (), static_cast<uint16_t> (connection_portno));
+            printf ("Listening to port %s for a connection from %s...\n", connection_port.c_str (), connection_host.c_str ());
+
+            // If we have a named pipe to write the port number back to, do that now.
+            if (named_pipe_path && named_pipe_path[0] && connection_portno == 0)
+            {
+                const uint16_t bound_port = s_listen_connection_up->GetListeningPort (10);
+                if (bound_port > 0)
+                {
+                    error = writePortToPipe (named_pipe_path, bound_port);
+                    if (error.Fail ())
+                    {
+                        fprintf (stderr, "failed to write to the named pipe \'%s\': %s", named_pipe_path, error.AsCString());
+                    }
+                }
+                else
+                {
+                    fprintf (stderr, "unable to get the bound port for the listening connection\n");
+                }
+            }
+
+            // Join the listener thread.
+            if (!JoinListenThread ())
+            {
+                fprintf (stderr, "failed to join the listener thread\n");
+                display_usage (progname, subcommand);
+                exit (1);
+            }
+
+            // Ensure we connected.
+            if (s_listen_connection_up)
+            {
+                printf ("Connection established '%s'\n", s_listen_connection_up->GetURI().c_str());
+                gdb_server.SetConnection (s_listen_connection_up.release());
+            }
+            else
+            {
+                fprintf (stderr, "failed to connect to '%s': %s\n", final_host_and_port.c_str (), error.AsCString ());
+                display_usage (progname, subcommand);
+                exit (1);
+            }
+        }
+    }
+
+    if (gdb_server.IsConnected())
+    {
+        // After we connected, we need to get an initial ack from...
+        if (gdb_server.HandshakeWithClient(&error))
+        {
+            // We'll use a half a second timeout interval so that an exit conditions can
+            // be checked that often.
+            const uint32_t TIMEOUT_USEC = 500000;
+
+            bool interrupt = false;
+            bool done = false;
+            while (!interrupt && !done && (g_sighup_received_count < 2))
+            {
+                const GDBRemoteCommunication::PacketResult result = gdb_server.GetPacketAndSendResponse (TIMEOUT_USEC, error, interrupt, done);
+                if ((result != GDBRemoteCommunication::PacketResult::Success) &&
+                    (result != GDBRemoteCommunication::PacketResult::ErrorReplyTimeout))
+                {
+                    // We're bailing out - we only support successful handling and timeouts.
+                    fprintf(stderr, "leaving packet loop due to PacketResult %d\n", result);
+                    break;
+                }
+            }
+
+            if (error.Fail())
+            {
+                fprintf(stderr, "error: %s\n", error.AsCString());
+            }
+        }
+        else
+        {
+            fprintf(stderr, "error: handshake with client failed\n");
+        }
+    }
+    else
+    {
+        fprintf (stderr, "no connection information provided, unable to run\n");
+        display_usage (progname, subcommand);
+        exit (1);
+    }
+}
+
+//----------------------------------------------------------------------
+// main
+//----------------------------------------------------------------------
+int
+main_gdbserver (int argc, char *argv[])
+{
+#ifndef _WIN32
+    // Setup signal handlers first thing.
+    signal (SIGPIPE, signal_handler);
+    signal (SIGHUP, signal_handler);
+#endif
+
+    const char *progname = argv[0];
+    const char *subcommand = argv[1];
+    argc--;
+    argv++;
+    int long_option_index = 0;
+    StreamSP log_stream_sp;
+    Args log_args;
+    Error error;
+    int ch;
+    std::string platform_name;
+    std::string attach_target;
+    std::string named_pipe_path;
+    bool reverse_connect = false;
+
+    Debugger::Initialize (NULL);
+
+    lldb::DebuggerSP debugger_sp = Debugger::CreateInstance ();
+
+    debugger_sp->SetInputFileHandle(stdin, false);
+    debugger_sp->SetOutputFileHandle(stdout, false);
+    debugger_sp->SetErrorFileHandle(stderr, false);
+
+    // ProcessLaunchInfo launch_info;
+    ProcessAttachInfo attach_info;
+
+    bool show_usage = false;
+    int option_error = 0;
+#if __GLIBC__
+    optind = 0;
+#else
+    optreset = 1;
+    optind = 1;
+#endif
+
+    std::string short_options(OptionParser::GetShortOptionString(g_long_options));
+
+    std::vector<std::string> lldb_commands;
+
+    while ((ch = getopt_long_only(argc, argv, short_options.c_str(), g_long_options, &long_option_index)) != -1)
+    {
+        switch (ch)
+        {
+        case 0:   // Any optional that auto set themselves will return 0
+            break;
+
+        case 'l': // Set Log File
+            if (optarg && optarg[0])
+            {
+                if ((strcasecmp(optarg, "stdout") == 0) || (strcmp(optarg, "/dev/stdout") == 0))
+                {
+                    log_stream_sp.reset (new StreamFile (stdout, false));
+                }
+                else if ((strcasecmp(optarg, "stderr") == 0) || (strcmp(optarg, "/dev/stderr") == 0))
+                {
+                    log_stream_sp.reset (new StreamFile (stderr, false));
+                }
+                else
+                {
+                    FILE *log_file = fopen(optarg, "w");
+                    if (log_file)
+                    {
+                        setlinebuf(log_file);
+                        log_stream_sp.reset (new StreamFile (log_file, true));
+                    }
+                    else
+                    {
+                        const char *errno_str = strerror(errno);
+                        fprintf (stderr, "Failed to open log file '%s' for writing: errno = %i (%s)", optarg, errno, errno_str ? errno_str : "unknown error");
+                    }
+
+                }
+            }
+            break;
+
+        case 'f': // Log Flags
+            if (optarg && optarg[0])
+                log_args.AppendArgument(optarg);
+            break;
+
+        case 'c': // lldb commands
+            if (optarg && optarg[0])
+                lldb_commands.push_back(optarg);
+            break;
+
+        case 'p': // platform name
+            if (optarg && optarg[0])
+                platform_name = optarg;
+            break;
+
+        case 'P': // named pipe
+            if (optarg && optarg[0])
+                named_pipe_path = optarg;
+            break;
+
+        case 'r':
+            // Do nothing, native regs is the default these days
+            break;
+
+        case 'R':
+            reverse_connect = true;
+            break;
+
+#ifndef _WIN32
+        case 'S':
+            // Put llgs into a new session. Terminals group processes
+            // into sessions and when a special terminal key sequences
+            // (like control+c) are typed they can cause signals to go out to
+            // all processes in a session. Using this --setsid (-S) option
+            // will cause debugserver to run in its own sessions and be free
+            // from such issues.
+            //
+            // This is useful when llgs is spawned from a command
+            // line application that uses llgs to do the debugging,
+            // yet that application doesn't want llgs receiving the
+            // signals sent to the session (i.e. dying when anyone hits ^C).
+            {
+                const ::pid_t new_sid = setsid();
+                if (new_sid == -1)
+                {
+                    const char *errno_str = strerror(errno);
+                    fprintf (stderr, "failed to set new session id for %s (%s)\n", LLGS_PROGRAM_NAME, errno_str ? errno_str : "<no error string>");
+                }
+            }
+            break;
+#endif
+
+        case 'a': // attach {pid|process_name}
+            if (optarg && optarg[0])
+                attach_target = optarg;
+                break;
+
+        case 'h':   /* fall-through is intentional */
+        case '?':
+            show_usage = true;
+            break;
+        }
+    }
+
+    if (show_usage || option_error)
+    {
+        display_usage(progname, subcommand);
+        exit(option_error);
+    }
+
+    if (log_stream_sp)
+    {
+        if (log_args.GetArgumentCount() == 0)
+            log_args.AppendArgument("default");
+        ProcessGDBRemoteLog::EnableLog (log_stream_sp, 0,log_args.GetConstArgumentVector(), log_stream_sp.get());
+    }
+    Log *log(lldb_private::GetLogIfAnyCategoriesSet (GDBR_LOG_VERBOSE));
+    if (log)
+    {
+        log->Printf ("lldb-gdbserver launch");
+        for (int i = 0; i < argc; i++)
+        {
+            log->Printf ("argv[%i] = '%s'", i, argv[i]);
+        }
+    }
+
+    // Skip any options we consumed with getopt_long_only.
+    argc -= optind;
+    argv += optind;
+
+    if (argc == 0)
+    {
+        display_usage(progname, subcommand);
+        exit(255);
+    }
+
+    // Run any commands requested.
+    run_lldb_commands (debugger_sp, lldb_commands);
+
+    // Setup the platform that GDBRemoteCommunicationServerLLGS will use.
+    lldb::PlatformSP platform_sp = setup_platform (platform_name);
+
+    GDBRemoteCommunicationServerLLGS gdb_server (platform_sp, debugger_sp);
+
+    const char *const host_and_port = argv[0];
+    argc -= 1;
+    argv += 1;
+
+    // Any arguments left over are for the the program that we need to launch. If there
+    // are no arguments, then the GDB server will start up and wait for an 'A' packet
+    // to launch a program, or a vAttach packet to attach to an existing process, unless
+    // explicitly asked to attach with the --attach={pid|program_name} form.
+    if (!attach_target.empty ())
+        handle_attach (gdb_server, attach_target);
+    else if (argc > 0)
+        handle_launch (gdb_server, argc, argv);
+
+    // Print version info.
+    printf("%s-%s", LLGS_PROGRAM_NAME, LLGS_VERSION_STR);
+
+    ConnectToRemote (gdb_server, reverse_connect, host_and_port, progname, subcommand, named_pipe_path.c_str ());
+
+    Debugger::Terminate ();
+
+    fprintf(stderr, "lldb-gdbserver exiting...\n");
+
+    return 0;
+}

lldb/trunk/tools/lldb-server/lldb-platform.cpp

+//===-- lldb-platform.cpp ---------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include "lldb/lldb-python.h"
+
+// C Includes
+#include <errno.h>
+#if defined(__APPLE__)
+#include <netinet/in.h>
+#endif
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+// C++ Includes
+
+// Other libraries and framework includes
+#include "lldb/lldb-private-log.h"
+#include "lldb/Core/Error.h"
+#include "lldb/Core/ConnectionMachPort.h"
+#include "lldb/Core/Debugger.h"
+#include "lldb/Core/StreamFile.h"
+#include "lldb/Host/ConnectionFileDescriptor.h"
+#include "lldb/Host/HostGetOpt.h"
+#include "lldb/Host/OptionParser.h"
+#include "lldb/Interpreter/CommandInterpreter.h"
+#include "lldb/Interpreter/CommandReturnObject.h"
+#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationServerPlatform.h"
+#include "Plugins/Process/gdb-remote/ProcessGDBRemoteLog.h"
+
+using namespace lldb;
+using namespace lldb_private;
+
+//----------------------------------------------------------------------
+// option descriptors for getopt_long_only()
+//----------------------------------------------------------------------
+
+static int g_debug = 0;
+static int g_verbose = 0;
+static int g_stay_alive = 0;
+
+static struct option g_long_options[] =
+{
+    { "debug",              no_argument,        &g_debug,           1   },
+    { "verbose",            no_argument,        &g_verbose,         1   },
+    { "stay-alive",         no_argument,        &g_stay_alive,      1   },
+    { "listen",             required_argument,  NULL,               'L' },
+    { "port-offset",        required_argument,  NULL,               'p' },
+    { "gdbserver-port",     required_argument,  NULL,               'P' },
+    { "min-gdbserver-port", required_argument,  NULL,               'm' },
+    { "max-gdbserver-port", required_argument,  NULL,               'M' },
+    { "lldb-command",       required_argument,  NULL,               'c' },
+    { NULL,                 0,                  NULL,               0   }
+};
+
+#if defined (__APPLE__)
+#define LOW_PORT    (IPPORT_RESERVED)
+#define HIGH_PORT   (IPPORT_HIFIRSTAUTO)
+#else
+#define LOW_PORT    (1024u)
+#define HIGH_PORT   (49151u)
+#endif
+
+
+//----------------------------------------------------------------------
+// Watch for signals
+//----------------------------------------------------------------------
+static void
+signal_handler(int signo)
+{
+    switch (signo)
+    {
+    case SIGHUP:
+        // Use SIGINT first, if that does not work, use SIGHUP as a last resort.
+        // And we should not call exit() here because it results in the global destructors
+        // to be invoked and wreaking havoc on the threads still running.
+        Host::SystemLog(Host::eSystemLogWarning, "SIGHUP received, exiting lldb-platform...\n");
+        abort();
+        break;
+    }
+}
+
+static void
+display_usage (const char *progname, const char *subcommand)
+{
+    fprintf(stderr, "Usage:\n  %s %s [--log-file log-file-path] [--log-flags flags] --listen port\n", progname, subcommand);
+    exit(0);
+}
+
+//----------------------------------------------------------------------
+// main
+//----------------------------------------------------------------------
+int
+main_platform (int argc, char *argv[])
+{
+    const char *progname = argv[0];
+    const char *subcommand = argv[1];
+    argc--;
+    argv++;
+    signal (SIGPIPE, SIG_IGN);
+    signal (SIGHUP, signal_handler);
+    int long_option_index = 0;
+    Error error;
+    std::string listen_host_port;
+    int ch;
+    Debugger::Initialize(NULL);
+
+    lldb::DebuggerSP debugger_sp = Debugger::CreateInstance ();
+
+    debugger_sp->SetInputFileHandle(stdin, false);
+    debugger_sp->SetOutputFileHandle(stdout, false);
+    debugger_sp->SetErrorFileHandle(stderr, false);
+    
+    GDBRemoteCommunicationServerPlatform::PortMap gdbserver_portmap;
+    int min_gdbserver_port = 0;
+    int max_gdbserver_port = 0;
+    uint16_t port_offset = 0;
+    
+    std::vector<std::string> lldb_commands;
+    bool show_usage = false;
+    int option_error = 0;
+    
+    std::string short_options(OptionParser::GetShortOptionString(g_long_options));
+                            
+#if __GLIBC__
+    optind = 0;
+#else
+    optreset = 1;
+    optind = 1;
+#endif
+
+    while ((ch = getopt_long_only(argc, argv, short_options.c_str(), g_long_options, &long_option_index)) != -1)
+    {
+        switch (ch)
+        {
+        case 0:   // Any optional that auto set themselves will return 0
+            break;
+
+        case 'L':
+            listen_host_port.append (optarg);
+            break;
+
+        case 'p':
+            {
+                char *end = NULL;
+                long tmp_port_offset = strtoul(optarg, &end, 0);
+                if (end && *end == '\0')
+                {
+                    if (LOW_PORT <= tmp_port_offset && tmp_port_offset <= HIGH_PORT)
+                    {
+                        port_offset = (uint16_t)tmp_port_offset;
+                    }
+                    else
+                    {
+                        fprintf (stderr, "error: port offset %li is not in the valid user port range of %u - %u\n", tmp_port_offset, LOW_PORT, HIGH_PORT);
+                        option_error = 5;
+                    }
+                }
+                else
+                {
+                    fprintf (stderr, "error: invalid port offset string %s\n", optarg);
+                    option_error = 4;
+                }
+            }
+            break;
+                
+        case 'P':
+        case 'm':
+        case 'M':
+            {
+                char *end = NULL;
+                long portnum = strtoul(optarg, &end, 0);
+                if (end && *end == '\0')
+                {
+                    if (LOW_PORT <= portnum && portnum <= HIGH_PORT)
+                    {
+                        if (ch  == 'P')
+                            gdbserver_portmap[(uint16_t)portnum] = LLDB_INVALID_PROCESS_ID;
+                        else if (ch == 'm')
+                            min_gdbserver_port = portnum;
+                        else
+                            max_gdbserver_port = portnum;
+                    }
+                    else
+                    {
+                        fprintf (stderr, "error: port number %li is not in the valid user port range of %u - %u\n", portnum, LOW_PORT, HIGH_PORT);
+                        option_error = 1;
+                    }
+                }
+                else
+                {
+                    fprintf (stderr, "error: invalid port number string %s\n", optarg);
+                    option_error = 2;
+                }
+            }
+            break;
+            
+        case 'c':
+            lldb_commands.push_back(optarg);
+            break;
+
+        case 'h':   /* fall-through is intentional */
+        case '?':
+            show_usage = true;
+            break;
+        }
+    }
+
+    // Make a port map for a port range that was specified.
+    if (min_gdbserver_port < max_gdbserver_port)
+    {
+        for (uint16_t port = min_gdbserver_port; port < max_gdbserver_port; ++port)
+            gdbserver_portmap[port] = LLDB_INVALID_PROCESS_ID;
+    }
+    else if (min_gdbserver_port != max_gdbserver_port)
+    {
+        fprintf (stderr, "error: --min-gdbserver-port (%u) is greater than --max-gdbserver-port (%u)\n", min_gdbserver_port, max_gdbserver_port);
+        option_error = 3;
+        
+    }
+
+    // Print usage and exit if no listening port is specified.
+    if (listen_host_port.empty())
+        show_usage = true;
+    
+    if (show_usage || option_error)
+    {
+        display_usage(progname, subcommand);
+        exit(option_error);
+    }
+    
+    // Execute any LLDB commands that we were asked to evaluate.
+    for (const auto &lldb_command : lldb_commands)
+    {
+        lldb_private::CommandReturnObject result;
+        printf("(lldb) %s\n", lldb_command.c_str());
+        debugger_sp->GetCommandInterpreter().HandleCommand(lldb_command.c_str(), eLazyBoolNo, result);
+        const char *output = result.GetOutputData();
+        if (output && output[0])
+            puts(output);
+    }
+
+
+    do {
+        GDBRemoteCommunicationServerPlatform platform;
+        
+        if (port_offset > 0)
+            platform.SetPortOffset(port_offset);
+
+        if (!gdbserver_portmap.empty())
+        {
+            platform.SetPortMap(std::move(gdbserver_portmap));
+        }
+
+        if (!listen_host_port.empty())
+        {
+            std::unique_ptr<ConnectionFileDescriptor> conn_ap(new ConnectionFileDescriptor());
+            if (conn_ap.get())
+            {
+                std::string connect_url ("listen://");
+                connect_url.append(listen_host_port.c_str());
+
+                printf ("Listening for a connection from %s...\n", listen_host_port.c_str());
+                if (conn_ap->Connect(connect_url.c_str(), &error) == eConnectionStatusSuccess)
+                {
+                    printf ("Connection established.\n");
+                    platform.SetConnection (conn_ap.release());
+                }
+                else
+                {
+                    printf ("error: %s\n", error.AsCString());
+                }
+            }
+
+            if (platform.IsConnected())
+            {
+                // After we connected, we need to get an initial ack from...
+                if (platform.HandshakeWithClient(&error))
+                {
+                    bool interrupt = false;
+                    bool done = false;
+                    while (!interrupt && !done)
+                    {
+                        if (platform.GetPacketAndSendResponse (UINT32_MAX, error, interrupt, done) != GDBRemoteCommunication::PacketResult::Success)
+                            break;
+                    }
+                    
+                    if (error.Fail())
+                    {
+                        fprintf(stderr, "error: %s\n", error.AsCString());
+                    }
+                }
+                else
+                {
+                    fprintf(stderr, "error: handshake with client failed\n");
+                }
+            }
+        }
+    } while (g_stay_alive);
+
+    Debugger::Terminate();
+
+    fprintf(stderr, "lldb-platform exiting...\n");
+
+    return 0;
+}

lldb/trunk/tools/lldb-server/lldb-server.cpp

+//===-- lldb-server.cpp -----------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#include <stdio.h>
+#include <stdlib.h>
+
+    static void
+display_usage (const char *progname)
+{
+    fprintf(stderr, "Usage:\n"
+            "  %s g[dbserver] [options]\n"
+            "  %s p[latform] [options]\n"
+            "Invoke subcommand for additional help", progname, progname);
+    exit(0);
+}
+
+// Forward declarations of subcommand main methods.
+int main_gdbserver (int argc, char *argv[]);
+int main_platform (int argc, char *argv[]);
+
+//----------------------------------------------------------------------
+// main
+//----------------------------------------------------------------------
+int
+main (int argc, char *argv[])
+{
+    int option_error = 0;
+    const char *progname = argv[0];
+    if (argc < 2)
+    {
+        display_usage(progname);
+        exit(option_error);
+    }
+    else if (argv[1][0] == 'g')
+    {
+        main_gdbserver(argc, argv);
+    }
+    else if (argv[1][0] == 'p')
+    {
+        main_platform(argc, argv);
+    }
+    else {
+        display_usage(progname);
+        exit(option_error);
+    }
+}