Fix the arm build with xcode 5.1.

diff --git a/external/ikvm b/external/ikvm
index 92df59f033ef81a9b5a9cc6b09d44ed18d244517..893a0d4166ba1d83ad11e4ef2fc14840ed4294fb 160000 (submodule)
--- a/external/ikvm
+++ b/external/ikvm
@@ -1 +1 @@
-Subproject commit 92df59f033ef81a9b5a9cc6b09d44ed18d244517
+Subproject commit 893a0d4166ba1d83ad11e4ef2fc14840ed4294fb

diff --git a/mono/utils/mach-support-arm.c b/mono/utils/mach-support-arm.c
index eb5fd603514ef8a6d9c716858ad6d3dc9255d58c..5f242752ef75d6e211a390373268f94e92bc4bb2 100644 (file)
--- a/mono/utils/mach-support-arm.c
+++ b/mono/utils/mach-support-arm.c
@@ -19,6 +19,11 @@
 #include "utils/mono-compiler.h"
 #include "mach-support.h"
 
+/* _mcontext.h now defines __darwin_mcontext32, not __darwin_mcontext, starting with Xcode 5.1 */
+#ifdef _STRUCT_MCONTEXT32
+       #define __darwin_mcontext       __darwin_mcontext32
+#endif
+
 /* Known offsets used for TLS storage*/