summaryrefslogtreecommitdiffstats
path: root/lldb/tools/debugserver/source/MacOSX
diff options
context:
space:
mode:
authorFrederic Riss <friss@apple.com>2018-06-15 02:50:45 +0000
committerFrederic Riss <friss@apple.com>2018-06-15 02:50:45 +0000
commit9745a0adb21fc732a4afead343c1e791cce85b14 (patch)
tree315200f061cc626ded97bd295e6f0c7d176d65e9 /lldb/tools/debugserver/source/MacOSX
parent52560ba1053c0abb307f7d91bbf97f3a39da63ce (diff)
downloadbcm5719-llvm-9745a0adb21fc732a4afead343c1e791cce85b14.tar.gz
bcm5719-llvm-9745a0adb21fc732a4afead343c1e791cce85b14.zip
Add support for PLATFORM_*SIMULATOR
The toolchain in Xcode 10 uses a new LC_BUILD_VERSION entry to identify simulator binaries. Add support for reading those to debugserver. The exisitng test testing that code is currently failling when run with Xcode 10, no need for a new test. llvm-svn: 334784
Diffstat (limited to 'lldb/tools/debugserver/source/MacOSX')
-rw-r--r--lldb/tools/debugserver/source/MacOSX/MachProcess.mm8
1 files changed, 8 insertions, 0 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
index 2703271ee99..4ddc5f8b10d 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
+++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
@@ -607,6 +607,11 @@ const char *MachProcess::GetDeploymentInfo(const struct load_command& lc,
}
}
#if defined (LC_BUILD_VERSION)
+#ifndef PLATFORM_IOSSIMULATOR
+#define PLATFORM_IOSSIMULATOR 7
+#define PLATFORM_TVOSSIMULATOR 8
+#define PLATFORM_WATCHOSSIMULATOR 9
+#endif
if (cmd == LC_BUILD_VERSION) {
struct build_version_command build_vers;
if (ReadMemory(load_command_address, sizeof(struct build_version_command),
@@ -621,10 +626,13 @@ const char *MachProcess::GetDeploymentInfo(const struct load_command& lc,
case PLATFORM_MACOS:
return "macosx";
case PLATFORM_IOS:
+ case PLATFORM_IOSSIMULATOR:
return "ios";
case PLATFORM_TVOS:
+ case PLATFORM_TVOSSIMULATOR:
return "tvos";
case PLATFORM_WATCHOS:
+ case PLATFORM_WATCHOSSIMULATOR:
return "watchos";
case PLATFORM_BRIDGEOS:
return "bridgeos";
OpenPOWER on IntegriCloud