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 #555 from jack-pappas/sigaltstack-patch
[mono.git]
/
mono
/
mini
/
mini-arch.h
diff --git
a/mono/mini/mini-arch.h
b/mono/mini/mini-arch.h
index ad200b02fd0a2b78003eaf29fba25061dd486370..d47bcb18a73951c7dcd947c4efb6b33c2dd6b96b 100644
(file)
--- a/
mono/mini/mini-arch.h
+++ b/
mono/mini/mini-arch.h
@@
-1,15
+1,15
@@
#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
@@
-17,12
+17,18
@@
# 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-
alpha
.h"
+#elif defined(__
mips
__)
+#include "mini-
mips
.h"
#else
#error add arch specific include file in mini-arch.h
#endif
#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__ */
#endif /* __MONO_MINI_ARCH_H__ */