[Host.mm] Check for the right macro instead of inlining it

[vsk]

lldb/source/Host/macosx/objcxx/Host.mm

14

This is missing __arm__, right? Why not just include TargetConditionals.h and change the the check to TARGET_OS_EMBEDDED?

https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h

[jasonmolenda]

I don't know about checking for NO_XPC_SERVICES for these -- they're LaunchServices/AppleScript related. As Vedant mentioned with the earlier check, I think TARGET_OS_EMBEDDED rather than an architecture check would be the most correct change; these services are not available on iOS etc.

[vsk]

This just came up again as the watchOS/tvOS build breaks without the TARGET_OS_EMBEDDED check.

[vsk]

• Check TARGET_OS_EMBEDDED.

[davide]

LGTM =)

[teemperor]

I think this is now causing a warning:

1600⧐952 ( 37%) Building CXX object tools/lldb/source/Host/macosx/objcxx/CMakeFiles/lldbHostMacOSXObjCXX.dir/Host.mm.o
/Users/teemperor/2llvm/llvm-project/lldb/source/Host/macosx/objcxx/Host.mm:139:14: warning: unused function 'AcceptPIDFromInferior' [-Wunused-function]
static void *AcceptPIDFromInferior(void *arg) {
             ^
1 warning generated.

[vsk]

Fixed in d23c15a687ff15327b88fa64da3184395012c2dc.

[vsk]

Reverted in bf65f19bce88fd9f1a74154d92afe37193ecd7a5. Jason pointed out this breaks macOS, as TARGET_OS_EMBEDDED is always defined (just not always to 1). Let's try this again.

lldb/source/Host/macosx/objcxx/Host.mm

 //===----------------------------------------------------------------------===//
 
 #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__))
-#define NO_XPC_SERVICES 1
-#endif
-
-#if !defined(NO_XPC_SERVICES)
+#if TARGET_OS_OSX
 #define __XPC_PRIVATE_H__
 #include <xpc/xpc.h>
 
 #define LaunchUsingXPCRightName "com.apple.lldb.RootDebuggingXPCService"
 

   }
 #endif
   return false;
 }
 
+#if TARGET_OS_OSX
+
 static void *AcceptPIDFromInferior(void *arg) {
   const char *connect_url = (const char *)arg;
   ConnectionFileDescriptor file_conn;
   Status error;
   if (file_conn.Connect(connect_url, &error) == eConnectionStatusSuccess) {

     }
   }
   return NULL;
 }
 
-#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
-
 const char *applscript_in_new_tty = "tell application \"Terminal\"\n"
                                     "   activate\n"
                                     "  do script \"/bin/bash -c '%s';exit\"\n"
                                     "end tell\n";
 

   if (pid != LLDB_INVALID_PROCESS_ID)
     launch_info.SetProcessID(pid);
   return error;
 }
 
-#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
+#endif // TARGET_OS_OSX
 
 bool Host::OpenFileInExternalEditor(const FileSpec &file_spec,
                                     uint32_t line_no) {
-#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
+#if !TARGET_OS_OSX
   return false;
-#else
+#else // !TARGET_OS_OSX
   // We attach this to an 'odoc' event to specify a particular selection
   typedef struct {
     int16_t reserved0; // must be zero
     int16_t fLineNumber;
     int32_t fSelStart;

 
     return false;
   }
 
   return true;
-#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
+#endif // TARGET_OS_OSX
 }
 
 Environment Host::GetEnvironment() { return Environment(*_NSGetEnviron()); }
 
 static bool GetMacOSXProcessCPUType(ProcessInstanceInfo &process_info) {

 
   process_info.Clear();
   return false;
 }
 
-#if !NO_XPC_SERVICES
+#if TARGET_OS_OSX
 static void PackageXPCArguments(xpc_object_t message, const char *prefix,
                                 const Args &args) {
   size_t count = args.GetArgumentCount();
   char buf[50]; // long enough for 'argXXX'
   memset(buf, 0, 50);

 }
 
 static Status LaunchProcessXPC(const char *exe_path,
                                ProcessLaunchInfo &launch_info,
                                lldb::pid_t &pid) {
-#if !NO_XPC_SERVICES
+#if TARGET_OS_OSX
   Status error = getXPCAuthorization(launch_info);
   if (error.Fail())
     return error;
 
   Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_HOST |

 }
 
 static bool ShouldLaunchUsingXPC(ProcessLaunchInfo &launch_info) {
   bool result = false;
 
-#if !NO_XPC_SERVICES
+#if TARGET_OS_OSX
   bool launchingAsRoot = launch_info.GetUserID() == 0;
   bool currentUserIsRoot = HostInfo::GetEffectiveUserID() == 0;
 
   if (launchingAsRoot && !currentUserIsRoot) {
     // If current user is already root, we don't need XPC's help.

                                     exe_spec);
     return error;
   }
 
   if (launch_info.GetFlags().Test(eLaunchFlagLaunchInTTY)) {
-#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
+#if TARGET_OS_OSX
     return LaunchInNewTerminalWithAppleScript(exe_spec.GetPath().c_str(),
                                               launch_info);
 #else
     error.SetErrorString("launching a process in a new terminal is not "
                          "supported on iOS devices");