projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4716 from Unity-Technologies/eglib-msvc-targets
[mono.git]
/
mono
/
mini
/
mini-arch.h
diff --git
a/mono/mini/mini-arch.h
b/mono/mini/mini-arch.h
index 67b182af8e82f33c90060f2b5104cbc246027ca3..9a8e05e8ec69b4b508763ce17a73c417db899541 100644
(file)
--- a/
mono/mini/mini-arch.h
+++ b/
mono/mini/mini-arch.h
@@
-1,26
+1,30
@@
+/**
+ * \file
+ */
+
#ifndef __MONO_MINI_ARCH_H__
#define __MONO_MINI_ARCH_H__
#ifndef __MONO_MINI_ARCH_H__
#define __MONO_MINI_ARCH_H__
-#ifdef
__i386__
+#ifdef
TARGET_X86
#include "mini-x86.h"
#include "mini-x86.h"
-#elif defined(
__x86_64__
)
+#elif defined(
TARGET_AMD64
)
#include "mini-amd64.h"
#include "mini-amd64.h"
-#elif defined(
__ppc__) || defined(__powerpc__
)
+#elif defined(
TARGET_POWERPC
)
#include "mini-ppc.h"
#elif defined(__sparc__) || defined(sparc)
#include "mini-sparc.h"
#include "mini-ppc.h"
#elif defined(__sparc__) || defined(sparc)
#include "mini-sparc.h"
-#elif defined(
__s390__) || defined(s390
)
+#elif defined(
TARGET_S390X
)
# if defined(__s390x__)
# include "mini-s390x.h"
# else
# if defined(__s390x__)
# include "mini-s390x.h"
# else
-#
include "mini-s390.h
"
+#
error "s390 is no longer supported.
"
# endif
#elif defined(__ia64__)
#include "mini-ia64.h"
# endif
#elif defined(__ia64__)
#include "mini-ia64.h"
-#elif defined(
__arm__
)
+#elif defined(
TARGET_ARM
)
#include "mini-arm.h"
#include "mini-arm.h"
-#elif defined(
__alpha__
)
-#include "mini-a
lpha
.h"
+#elif defined(
TARGET_ARM64
)
+#include "mini-a
rm64
.h"
#elif defined(__mips__)
#include "mini-mips.h"
#else
#elif defined(__mips__)
#include "mini-mips.h"
#else
@@
-28,7
+32,7
@@
#endif
#if (MONO_ARCH_FRAME_ALIGNMENT == 4)
#endif
#if (MONO_ARCH_FRAME_ALIGNMENT == 4)
-#define MONO_ARCH_LOCALLOC_ALIGNME
E
NT 8
+#define MONO_ARCH_LOCALLOC_ALIGNMENT 8
#else
#define MONO_ARCH_LOCALLOC_ALIGNMENT MONO_ARCH_FRAME_ALIGNMENT
#endif
#else
#define MONO_ARCH_LOCALLOC_ALIGNMENT MONO_ARCH_FRAME_ALIGNMENT
#endif