Author: Adrian Prantl Date: 2020-07-10T17:13:46-07:00 New Revision: 851cc2f8f60ad86a8af4f57d23df0c930efdc4da
URL: https://github.com/llvm/llvm-project/commit/851cc2f8f60ad86a8af4f57d23df0c930efdc4da DIFF: https://github.com/llvm/llvm-project/commit/851cc2f8f60ad86a8af4f57d23df0c930efdc4da.diff LOG: Fix nesting of #ifdef This fixes a compile error when building for an arm64 host. Differential Revision: https://reviews.llvm.org/D83582 Added: Modified: lldb/tools/debugserver/source/MacOSX/MachProcess.mm Removed: ################################################################################ diff --git a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm index 4bf5305cd67b..8a35f605daa3 100644 --- a/lldb/tools/debugserver/source/MacOSX/MachProcess.mm +++ b/lldb/tools/debugserver/source/MacOSX/MachProcess.mm @@ -780,11 +780,11 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options, if (DeploymentInfo deployment_info = GetDeploymentInfo(lc, load_cmds_p)) { // Simulator support. If the platform is ambiguous, use the dyld info. if (deployment_info.maybe_simulator) { - // If dyld doesn't return a platform, use a heuristic. -#if (defined(__x86_64__) || defined(__i386__)) - // If we are running on Intel macOS, it is safe to assume - // this is really a back-deploying simulator binary. if (deployment_info.maybe_simulator) { +#if (defined(__x86_64__) || defined(__i386__)) + // If dyld doesn't return a platform, use a heuristic. + // If we are running on Intel macOS, it is safe to assume + // this is really a back-deploying simulator binary. switch (deployment_info.platform) { case PLATFORM_IOS: deployment_info.platform = PLATFORM_IOSSIMULATOR; @@ -797,12 +797,12 @@ static bool FBSAddEventDataToOptions(NSMutableDictionary *options, break; } #else - // On an Apple Silicon macOS host, there is no - // ambiguity. The only binaries that use legacy load - // commands are back-deploying native iOS binaries. All - // simulator binaries use the newer, unambiguous - // LC_BUILD_VERSION load commands. - deployment_info.maybe_simulator = false; + // On an Apple Silicon macOS host, there is no + // ambiguity. The only binaries that use legacy load + // commands are back-deploying native iOS binaries. All + // simulator binaries use the newer, unambiguous + // LC_BUILD_VERSION load commands. + deployment_info.maybe_simulator = false; #endif } } _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
