set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
add_compile_options(-arch arm64)
elseif(CLR_CMAKE_HOST_ARCH_AMD64)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
add_compile_options(-arch x86_64)
else()
clr_unknown_arch()
#include <mach/mach_port.h>
#include <mach/mach_host.h>
-#if defined(HOST_ARM64)
#include <mach/task.h>
#include <mach/vm_map.h>
extern "C"
abort(); \
} \
} while (false)
-#endif // defined(HOST_ARM64)
#endif // __APPLE__
{
s_flushUsingMemBarrier = TRUE;
}
-#if !(defined(TARGET_OSX) && defined(HOST_ARM64))
+#ifndef TARGET_OSX
else
{
assert(g_helperPage == 0);
return false;
}
}
-#endif // !(defined(TARGET_OSX) && defined(HOST_ARM64))
+#endif // !TARGET_OSX
InitializeCGroup();
status = pthread_mutex_unlock(&g_flushProcessWriteBuffersMutex);
assert(status == 0 && "Failed to unlock the flushProcessWriteBuffersMutex lock");
}
-#if defined(TARGET_OSX) && defined(HOST_ARM64)
+#ifdef TARGET_OSX
else
{
mach_msg_type_number_t cThreads;
machret = vm_deallocate(mach_task_self(), (vm_address_t)pThreads, cThreads * sizeof(thread_act_t));
CHECK_MACH("vm_deallocate()", machret);
}
-#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
+#endif // TARGET_OSX
}
// Break into a debugger. Uses a compiler intrinsic if one is available,
#include <libproc.h>
#include <sys/sysctl.h>
#include <sys/posix_sem.h>
-#if defined(HOST_ARM64)
#include <mach/task.h>
#include <mach/vm_map.h>
extern "C"
} \
} while (false)
-#endif // defined(HOST_ARM64)
#endif // __APPLE__
#ifdef __NetBSD__
}
}
-#if defined(TARGET_OSX) && defined(HOST_ARM64)
+#ifdef TARGET_OSX
return TRUE;
#else
s_helperPage = static_cast<int*>(mmap(0, GetVirtualPageSize(), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0));
}
return status == 0;
-#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
+#endif // TARGET_OSX
}
#define FATAL_ASSERT(e, msg) \
status = pthread_mutex_unlock(&flushProcessWriteBuffersMutex);
FATAL_ASSERT(status == 0, "Failed to unlock the flushProcessWriteBuffersMutex lock");
}
-#if defined(TARGET_OSX) && defined(HOST_ARM64)
+#ifdef TARGET_OSX
else
{
mach_msg_type_number_t cThreads;
machret = vm_deallocate(mach_task_self(), (vm_address_t)pThreads, cThreads * sizeof(thread_act_t));
CHECK_MACH("vm_deallocate()", machret);
}
-#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
+#endif // TARGET_OSX
}
/*++