Author: Davide Italiano Date: 2020-06-23T10:47:16-07:00 New Revision: 2276bb48be0175f96b1494ca67b7921f0d4e87d8
URL: https://github.com/llvm/llvm-project/commit/2276bb48be0175f96b1494ca67b7921f0d4e87d8 DIFF: https://github.com/llvm/llvm-project/commit/2276bb48be0175f96b1494ca67b7921f0d4e87d8.diff LOG: [debugserver] Initial support for Apple Silicon. Set the correct os type in the arch triple when running macOS. Debugserver currently always assumes macOS == x86_64. This patch generalizes the support to make sure it works on a different architecture. Differential Revision: https://reviews.llvm.org/D82394 Added: Modified: lldb/tools/debugserver/source/RNBRemote.cpp Removed: ################################################################################ diff --git a/lldb/tools/debugserver/source/RNBRemote.cpp b/lldb/tools/debugserver/source/RNBRemote.cpp index 5f066bda4227..8a3045564aaf 100644 --- a/lldb/tools/debugserver/source/RNBRemote.cpp +++ b/lldb/tools/debugserver/source/RNBRemote.cpp @@ -4908,6 +4908,8 @@ rnb_err_t RNBRemote::HandlePacket_qHostInfo(const char *p) { strm << "ostype:watchos;"; #elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1 strm << "ostype:bridgeos;"; +#elif defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1 + strm << "ostype:macosx;"; #else strm << "ostype:ios;"; #endif @@ -6336,7 +6338,7 @@ rnb_err_t RNBRemote::HandlePacket_qProcessInfo(const char *p) { if (addr_size > 0) { rep << "ptrsize:" << std::dec << addr_size << ';'; -#if (defined(__x86_64__) || defined(__i386__)) +#if defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1 // Try and get the OS type by looking at the load commands in the main // executable and looking for a LC_VERSION_MIN load command. This is the // most reliable way to determine the "ostype" value when on desktop. @@ -6366,7 +6368,7 @@ rnb_err_t RNBRemote::HandlePacket_qProcessInfo(const char *p) { load_command_addr = load_command_addr + lc.cmdsize; } } -#endif // when compiling this on x86 targets +#endif // TARGET_OS_OSX } // If we weren't able to find the OS in a LC_VERSION_MIN load command, try @@ -6383,6 +6385,8 @@ rnb_err_t RNBRemote::HandlePacket_qProcessInfo(const char *p) { rep << "ostype:watchos;"; #elif defined(TARGET_OS_BRIDGE) && TARGET_OS_BRIDGE == 1 rep << "ostype:bridgeos;"; +#elif defined(TARGET_OS_OSX) && TARGET_OS_OSX == 1 + rep << "ostype:macosx;"; #else rep << "ostype:ios;"; #endif _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits