This revision was automatically updated to reflect the committed changes. Closed by commit rG936d1427da14: [Host.mm] Check for the right macro instead of inlining it (authored by vsk).
Changed prior to commit: https://reviews.llvm.org/D73938?vs=243608&id=243613#toc Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D73938/new/ https://reviews.llvm.org/D73938 Files: lldb/source/Host/macosx/objcxx/Host.mm Index: lldb/source/Host/macosx/objcxx/Host.mm =================================================================== --- lldb/source/Host/macosx/objcxx/Host.mm +++ lldb/source/Host/macosx/objcxx/Host.mm @@ -9,9 +9,10 @@ #include "lldb/Host/Host.h" #include <AvailabilityMacros.h> +#include <TargetConditionals.h> // On device doesn't have supporty for XPC. -#if defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) +#if defined(__APPLE__) && defined(TARGET_OS_EMBEDDED) #define NO_XPC_SERVICES 1 #endif @@ -153,7 +154,7 @@ return NULL; } -#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#if !NO_XPC_SERVICES const char *applscript_in_new_tty = "tell application \"Terminal\"\n" " activate\n" @@ -307,11 +308,11 @@ return error; } -#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#endif // #if !NO_XPC_SERVICES bool Host::OpenFileInExternalEditor(const FileSpec &file_spec, uint32_t line_no) { -#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__) +#if NO_XPC_SERVICES return false; #else // We attach this to an 'odoc' event to specify a particular selection @@ -404,7 +405,7 @@ } return true; -#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#endif // #if !NO_XPC_SERVICES } Environment Host::GetEnvironment() { return Environment(*_NSGetEnviron()); } @@ -1263,7 +1264,7 @@ } if (launch_info.GetFlags().Test(eLaunchFlagLaunchInTTY)) { -#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#if !NO_XPC_SERVICES return LaunchInNewTerminalWithAppleScript(exe_spec.GetPath().c_str(), launch_info); #else
Index: lldb/source/Host/macosx/objcxx/Host.mm =================================================================== --- lldb/source/Host/macosx/objcxx/Host.mm +++ lldb/source/Host/macosx/objcxx/Host.mm @@ -9,9 +9,10 @@ #include "lldb/Host/Host.h" #include <AvailabilityMacros.h> +#include <TargetConditionals.h> // On device doesn't have supporty for XPC. -#if defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__)) +#if defined(__APPLE__) && defined(TARGET_OS_EMBEDDED) #define NO_XPC_SERVICES 1 #endif @@ -153,7 +154,7 @@ return NULL; } -#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#if !NO_XPC_SERVICES const char *applscript_in_new_tty = "tell application \"Terminal\"\n" " activate\n" @@ -307,11 +308,11 @@ return error; } -#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#endif // #if !NO_XPC_SERVICES bool Host::OpenFileInExternalEditor(const FileSpec &file_spec, uint32_t line_no) { -#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__) +#if NO_XPC_SERVICES return false; #else // We attach this to an 'odoc' event to specify a particular selection @@ -404,7 +405,7 @@ } return true; -#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#endif // #if !NO_XPC_SERVICES } Environment Host::GetEnvironment() { return Environment(*_NSGetEnviron()); } @@ -1263,7 +1264,7 @@ } if (launch_info.GetFlags().Test(eLaunchFlagLaunchInTTY)) { -#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__) +#if !NO_XPC_SERVICES return LaunchInNewTerminalWithAppleScript(exe_spec.GetPath().c_str(), launch_info); #else
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits