summaryrefslogtreecommitdiffstats
path: root/lldb/tools/debugserver
diff options
context:
space:
mode:
authorFrederic Riss <friss@apple.com>2018-04-25 22:12:12 +0000
committerFrederic Riss <friss@apple.com>2018-04-25 22:12:12 +0000
commit05e8bc85e63cd2f6b0795e7d254611439f63a238 (patch)
tree4559893c648a0cde0dbc8e59e7231060c54e4e92 /lldb/tools/debugserver
parent516837f2a1585d4a2a620162cc996ca763046e7d (diff)
downloadbcm5719-llvm-05e8bc85e63cd2f6b0795e7d254611439f63a238.tar.gz
bcm5719-llvm-05e8bc85e63cd2f6b0795e7d254611439f63a238.zip
[debugserver] Return 'ios' instead of 'iphoneos' for the ostype.
When I merged the 2 codepaths that return an OS type, I hade checked that the places accepting 'iphoneos' would also accept 'ios', but then I got it backwards and return 'iphoneos'. We use this value to build triples, and there 'iphoneos' is invalid. This also makes the test slightly simpler. llvm-svn: 330877
Diffstat (limited to 'lldb/tools/debugserver')
-rw-r--r--lldb/tools/debugserver/source/MacOSX/MachProcess.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
index c1689521e30..95565041e94 100644
--- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
+++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm
@@ -595,7 +595,7 @@ const char *MachProcess::GetDeploymentInfo(const struct load_command& lc,
switch (cmd) {
case LC_VERSION_MIN_IPHONEOS:
- return "iphoneos";
+ return "ios";
case LC_VERSION_MIN_MACOSX:
return "macosx";
case LC_VERSION_MIN_TVOS:
@@ -621,7 +621,7 @@ const char *MachProcess::GetDeploymentInfo(const struct load_command& lc,
case PLATFORM_MACOS:
return "macosx";
case PLATFORM_IOS:
- return "iphoneos";
+ return "ios";
case PLATFORM_TVOS:
return "tvos";
case PLATFORM_WATCHOS:
OpenPOWER on IntegriCloud