caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This breaks macOS, because TARGET_OS_EMBEDDED is always defined. Thanks
to Jason Molenda for pointing this out.

Revert "Do not define AcceptPIDFromInferior when it will not be used"

This reverts commit d23c15a687.
This reverts commit 936d1427da.
This commit is contained in:
Vedant Kumar
2020-02-10 14:33:44 -08:00
parent 480eea4e45
commit bf65f19bce
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lldb/source/Host/macosx/objcxx/Host.mm
View File

@@ -9,10 +9,9 @@
#include "lldb/Host/Host.h"
#include <AvailabilityMacros.h>
#include <TargetConditionals.h>
// On device doesn't have supporty for XPC.
#if defined(__APPLE__) && defined(TARGET_OS_EMBEDDED)
#if defined(__APPLE__) && (defined(__arm64__) || defined(__aarch64__))
#define NO_XPC_SERVICES 1
#endif
@@ -136,8 +135,6 @@ bool Host::ResolveExecutableInBundle(FileSpec &file) {
return false;
}
#if !NO_XPC_SERVICES
static void *AcceptPIDFromInferior(void *arg) {
const char *connect_url = (const char *)arg;
ConnectionFileDescriptor file_conn;
@@ -156,6 +153,8 @@ static void *AcceptPIDFromInferior(void *arg) {
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"
@@ -308,11 +307,11 @@ LaunchInNewTerminalWithAppleScript(const char *exe_path,
return error;
}
#endif // #if !NO_XPC_SERVICES
#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
bool Host::OpenFileInExternalEditor(const FileSpec &file_spec,
uint32_t line_no) {
#if NO_XPC_SERVICES
#if defined(__arm__) || defined(__arm64__) || defined(__aarch64__)
return false;
#else
// We attach this to an 'odoc' event to specify a particular selection
@@ -405,7 +404,7 @@ bool Host::OpenFileInExternalEditor(const FileSpec &file_spec,
}
return true;
#endif // #if !NO_XPC_SERVICES
#endif // #if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
}
Environment Host::GetEnvironment() { return Environment(*_NSGetEnviron()); }
@@ -1264,7 +1263,7 @@ Status Host::LaunchProcess(ProcessLaunchInfo &launch_info) {
}
if (launch_info.GetFlags().Test(eLaunchFlagLaunchInTTY)) {
#if !NO_XPC_SERVICES
#if !defined(__arm__) && !defined(__arm64__) && !defined(__aarch64__)
return LaunchInNewTerminalWithAppleScript(exe_spec.GetPath().c_str(),
launch_info);
#else