Retrieve thread lazily and avoid special case for defer. We were trying to get thread...

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

diff --git a/mono/mini/mini-arch.h b/mono/mini/mini-arch.h
index 0b8ceb6aca94f6a87d1c39e1a7017b9c3417638f..eb50de0f5e4aebe8a94ce6bea359635255c92c11 100644 (file)
--- a/mono/mini/mini-arch.h
+++ b/mono/mini/mini-arch.h
@@ -1,16 +1,38 @@
+/**
+ * \file
+ */
+
 #ifndef __MONO_MINI_ARCH_H__
 #define __MONO_MINI_ARCH_H__
 
-#ifdef __i386__
+#ifdef TARGET_X86
 #include "mini-x86.h"
-#elif defined(__ppc__) || defined(__powerpc__)
+#elif defined(TARGET_AMD64)
+#include "mini-amd64.h"
+#elif defined(TARGET_POWERPC)
 #include "mini-ppc.h"
 #elif defined(__sparc__) || defined(sparc)
 #include "mini-sparc.h"
-#elif defined(__s390__) || defined(s390)
-#include "mini-s390.h"
+#elif defined(TARGET_S390X)
+# if defined(__s390x__)
+#  include "mini-s390x.h"
+# else
+#error "s390 is no longer supported."
+# endif
+#elif defined(TARGET_ARM)
+#include "mini-arm.h"
+#elif defined(TARGET_ARM64)
+#include "mini-arm64.h"
+#elif defined(__mips__)
+#include "mini-mips.h"
 #else
 #error add arch specific include file in mini-arch.h
 #endif
 
+#if (MONO_ARCH_FRAME_ALIGNMENT == 4)
+#define MONO_ARCH_LOCALLOC_ALIGNMENT 8
+#else
+#define MONO_ARCH_LOCALLOC_ALIGNMENT MONO_ARCH_FRAME_ALIGNMENT
+#endif
+
 #endif /* __MONO_MINI_ARCH_H__ */