Revert "Revert "Merge branch 'master' of https://github.com/mono/mono""

[mono.git] / mono / utils / mono-threads-mach.c

diff --git a/mono/utils/mono-threads-mach.c b/mono/utils/mono-threads-mach.c
index 5674a7a918540b8b359f8a5fc9a15bad65a139ee..2f0e3ad5916513b7bc7bb2033df8163cf2994fed 100644 (file)
--- a/mono/utils/mono-threads-mach.c
+++ b/mono/utils/mono-threads-mach.c
@@ -25,7 +25,8 @@
 
 void
 mono_threads_init_platform (void)
-{      
+{
+       mono_threads_init_dead_letter ();
 }
 
 void
@@ -86,7 +87,11 @@ mono_threads_core_resume (MonoThreadInfo *info)
                        return FALSE;
 
                mono_mach_arch_thread_state_to_mcontext (state, mctx);
+#ifdef TARGET_ARM64
+               g_assert_not_reached ();
+#else
                uctx.uc_mcontext = mctx;
+#endif
                mono_monoctx_to_sigctx (&tmp, &uctx);
 
                mono_mach_arch_mcontext_to_thread_state (mctx, state);
@@ -105,6 +110,7 @@ void
 mono_threads_platform_register (MonoThreadInfo *info)
 {
        info->native_handle = mach_thread_self ();
+       mono_threads_install_dead_letter ();
 }
 
 void
@@ -136,4 +142,10 @@ mono_native_thread_create (MonoNativeThreadId *tid, gpointer func, gpointer arg)
        return pthread_create (tid, NULL, func, arg) == 0;
 }
 
+void
+mono_threads_core_set_name (MonoNativeThreadId tid, const char *name)
+{
+       /* pthread_setnmae_np() on Mac is not documented and doesn't receive thread id. */
+}
+
 #endif