diff options
| author | Jason Molenda <jmolenda@apple.com> | 2012-02-22 02:18:59 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2012-02-22 02:18:59 +0000 |
| commit | 42999a48f9cfce6f84c3a6f9b8f0a263130a0ce8 (patch) | |
| tree | b6d20feb6a01c474249f6956fa301bc97bc3b64b /lldb/tools/debugserver/source/debugserver.cpp | |
| parent | a1bed4cd96141eb92e94acd56d02167ec007626e (diff) | |
| download | bcm5719-llvm-42999a48f9cfce6f84c3a6f9b8f0a263130a0ce8.tar.gz bcm5719-llvm-42999a48f9cfce6f84c3a6f9b8f0a263130a0ce8.zip | |
Change #ifdef markers around lockdown and SpringBoard
calls to dpeend on WITH_SPRINGBOARD and WITH_LOCKDOWN
instead of __arm__. Add an RNBSocket::useFD method.
llvm-svn: 151119
Diffstat (limited to 'lldb/tools/debugserver/source/debugserver.cpp')
| -rw-r--r-- | lldb/tools/debugserver/source/debugserver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp index 00bd3cdd607..32749257710 100644 --- a/lldb/tools/debugserver/source/debugserver.cpp +++ b/lldb/tools/debugserver/source/debugserver.cpp @@ -192,7 +192,7 @@ RNBRunLoopLaunchInferior (RNBRemote *remote, const char *stdin_path, const char // Our default launch method is posix spawn launch_flavor = eLaunchFlavorPosixSpawn; -#if defined (__arm__) +#ifdef WITH_SPRINGBOARD // Check if we have an app bundle, if so launch using SpringBoard. if (strstr(inferior_argv[0], ".app")) { @@ -955,7 +955,7 @@ main (int argc, char *argv[]) g_launch_flavor = eLaunchFlavorPosixSpawn; else if (strcasestr(optarg, "fork") == optarg) g_launch_flavor = eLaunchFlavorForkExec; -#if defined (__arm__) +#ifdef WITH_SPRINGBOARD else if (strcasestr(optarg, "spring") == optarg) g_launch_flavor = eLaunchFlavorSpringBoard; #endif @@ -966,7 +966,7 @@ main (int argc, char *argv[]) RNBLogSTDERR (" auto Auto-detect the best launch method to use.\n"); RNBLogSTDERR (" posix Launch the executable using posix_spawn.\n"); RNBLogSTDERR (" fork Launch the executable using fork and exec.\n"); -#if defined (__arm__) +#ifdef WITH_SPRINGBOARD RNBLogSTDERR (" spring Launch the executable through Springboard.\n"); #endif exit (5); @@ -1234,7 +1234,7 @@ main (int argc, char *argv[]) switch (mode) { case eRNBRunLoopModeGetStartModeFromRemoteProtocol: -#if defined (__arm__) +#ifdef WITH_LOCKDOWN if (g_lockdown_opt) { if (!remote->Comm().IsConnected()) @@ -1308,7 +1308,7 @@ main (int argc, char *argv[]) // Our default launch method is posix spawn launch_flavor = eLaunchFlavorPosixSpawn; -#if defined (__arm__) +#ifdef WITH_SPRINGBOARD // Check if we have an app bundle, if so launch using SpringBoard. if (waitfor_pid_name.find (".app") != std::string::npos) { |
