Merge pull request #986 from ninjarobot/patch-1

[mono.git] / mono / mini / mini-s390x.h

diff --git a/mono/mini/mini-s390x.h b/mono/mini/mini-s390x.h
index dc59df0f5cfc2d6c2e50231a5c3e3b3c06048ece..a5be8f01087162cbde7ed649cf1cb945bc0464aa 100644 (file)
--- a/mono/mini/mini-s390x.h
+++ b/mono/mini/mini-s390x.h
@@ -15,7 +15,7 @@
 /*-------------------------------------------*/
 
 #define S390_LONG(loc, opy, op, r, ix, br, off)                                        \
-       if (has_ld) {                                                           \
+       if (mono_hwcap_s390x_has_ld) {                                          \
                if (s390_is_imm20(off)) {                                       \
                        s390_##opy (loc, r, ix, br, off);                       \
                } else {                                                        \
@@ -114,13 +114,20 @@ typedef struct
 #define MONO_ARCH_HAVE_DECOMPOSE_OPTS                  1
 #define MONO_ARCH_HAVE_CREATE_DELEGATE_TRAMPOLINE      1
 #define MONO_ARCH_HAVE_IMT                             1
+#define MONO_ARCH_HAVE_TLS_GET                         1
+#define MONO_ARCH_ENABLE_MONO_LMF_VAR                  1
 #define MONO_ARCH_IMT_REG                              s390_r9
+#define MONO_ARCH_VTABLE_REG                           MONO_ARCH_IMT_REG
+#define MONO_ARCH_RGCTX_REG                            MONO_ARCH_IMT_REG
 #define MONO_ARCH_THIS_AS_FIRST_ARG                    1
 #define MONO_ARCH_HAVE_XP_UNWIND                       1
 #define MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX               1
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED                 1
 #define MONO_ARCH_HAVE_CONTEXT_SET_INT_REG             1
 #define MONO_ARCH_USE_SIGACTION                        1
+#define MONO_ARCH_GC_MAPS_SUPPORTED                    1
+#define MONO_ARCH_GSHARED_SUPPORTED                    1
+#define MONO_ARCH_MONITOR_ENTER_ADJUSTMENT             1
 
 #define S390_STACK_ALIGNMENT            8
 #define S390_FIRST_ARG_REG             s390_r2