projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'upstream/master'
[mono.git]
/
mono
/
mini
/
mini-x86.h
diff --git
a/mono/mini/mini-x86.h
b/mono/mini/mini-x86.h
index 3063fc2cecae7bffbc927c5d7dba6198217ae0bc..3cc5b440367f1c37fcb09a7938a040e2afb67c1a 100644
(file)
--- a/
mono/mini/mini-x86.h
+++ b/
mono/mini/mini-x86.h
@@
-3,6
+3,14
@@
#include <mono/arch/x86/x86-codegen.h>
#include <mono/utils/mono-sigcontext.h>
#include <mono/arch/x86/x86-codegen.h>
#include <mono/utils/mono-sigcontext.h>
+
+#ifdef __native_client_codegen__
+#define kNaClAlignmentX86 32
+#define kNaClAlignmentMaskX86 (kNaClAlignmentX86 - 1)
+
+#define kNaClLengthOfCallImm kx86NaClLengthOfCallImm
+#endif
+
#ifdef HOST_WIN32
#include <windows.h>
/* use SIG* defines if possible */
#ifdef HOST_WIN32
#include <windows.h>
/* use SIG* defines if possible */
@@
-59,12
+67,6
@@
struct sigcontext {
#undef MONO_ARCH_USE_SIGACTION
#endif
#undef MONO_ARCH_USE_SIGACTION
#endif
-#if defined(__native_client_codegen__) || defined(__native_client__)
-#define NACL_SIZE(a, b) (b)
-#else
-#define NACL_SIZE(a, b) (a)
-#endif
-
#ifndef HOST_WIN32
#ifdef HAVE_WORKING_SIGALTSTACK
#ifndef HOST_WIN32
#ifdef HAVE_WORKING_SIGALTSTACK