[arm] Enable native types for Xamarin.WatchOS.dll too. Enable Unwind_Backtrace suppor...

diff --git a/mono/mini/mini-arm.h b/mono/mini/mini-arm.h
index 27ad7cf32f47caa98b574612a21f9642eaf05ce0..d672f13793ae19d5073dcbe603aa83835136b5a6 100644 (file)
--- a/mono/mini/mini-arm.h
+++ b/mono/mini/mini-arm.h
@@ -356,6 +356,7 @@ typedef struct MonoCompileArch {
 
 #ifdef TARGET_WATCHOS
 #define MONO_ARCH_DISABLE_HW_TRAPS 1
+#define MONO_ARCH_HAVE_UNWIND_BACKTRACE 1
 #endif
 
 /* ARM doesn't have too many registers, so we have to use a callee saved one */

diff --git a/mono/mini/mini-native-types.c b/mono/mini/mini-native-types.c
index 9ce9be8a98c08ce51866bafee0324a087b8ee4c0..5d66853ece98745dcfe334f57c49d357517159d9 100644 (file)
--- a/mono/mini/mini-native-types.c
+++ b/mono/mini/mini-native-types.c
@@ -349,6 +349,8 @@ mono_class_is_magic_assembly (MonoClass *klass)
                return TRUE;
        if (!strcmp ("Xamarin.Mac", klass->image->assembly_name))
                return TRUE;
+       if (!strcmp ("Xamarin.WatchOS", klass->image->assembly_name))
+               return TRUE;
        return FALSE;
 }