2006-09-11 Zoltan Varga <vargaz@gmail.com>

	* mini-x86.h mini-amd64.h mini-exceptions.c: Move the bsd specific MAP_ANON
	stuff to mini-exceptions.c where it is used.

svn path=/trunk/mono/; revision=65252

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 29b36b602fc775bfaa053cefc667c223f4e3eb36..ecdcc3aa2c2a7ccc937f82c0267eca47ad7c73c1 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -187,16 +187,6 @@ typedef struct {
 
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
 
-/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */
-#      if defined(__FreeBSD__) || defined(__NetBSD__) 
-#              ifndef SA_STACK
-#                      define SA_STACK SA_ONSTACK
-#              endif
-#              ifndef MAP_ANONYMOUS
-#                      define MAP_ANONYMOUS MAP_ANON
-#              endif
-#      endif /* BSDs */
-
 #endif
 
 #endif /* PLATFORM_WIN32 */

diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c
index 9124907ccad5ce844e7d153494cefa7f8f654e07..7212707ad68d5427c9c359935c76fe3290d0dc96 100644 (file)
--- a/mono/mini/mini-exceptions.c
+++ b/mono/mini/mini-exceptions.c
@@ -32,6 +32,16 @@
 #include <sys/mman.h>
 #endif
 
+/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */
+#      if defined(__FreeBSD__) || defined(__NetBSD__) 
+#              ifndef SA_STACK
+#                      define SA_STACK SA_ONSTACK
+#              endif
+#              ifndef MAP_ANONYMOUS
+#                      define MAP_ANONYMOUS MAP_ANON
+#              endif
+#      endif /* BSDs */
+
 #define IS_ON_SIGALTSTACK(jit_tls) ((jit_tls) && ((guint8*)&(jit_tls) > (guint8*)(jit_tls)->signal_stack) && ((guint8*)&(jit_tls) < ((guint8*)(jit_tls)->signal_stack + (jit_tls)->signal_stack_size)))
 
 #ifndef MONO_ARCH_CONTEXT_DEF

diff --git a/mono/mini/mini-x86.h b/mono/mini/mini-x86.h
index 8a08a0920d17812ecb318efd68487fec61d2d39e..4b9771644b7aaf39c6873f29a9f972f8ca003923 100644 (file)
--- a/mono/mini/mini-x86.h
+++ b/mono/mini/mini-x86.h
@@ -53,16 +53,6 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 #define MONO_ARCH_SIGSEGV_ON_ALTSTACK
 #define MONO_ARCH_USE_SIGACTION
 
-/* FreeBSD and NetBSD need SA_STACK and MAP_ANON re-definitions */
-#      if defined(__FreeBSD__) || defined(__NetBSD__) 
-#              ifndef SA_STACK
-#                      define SA_STACK SA_ONSTACK
-#              endif
-#              ifndef MAP_ANONYMOUS
-#                      define MAP_ANONYMOUS MAP_ANON
-#              endif
-#      endif /* BSDs */
-
 #endif /* HAVE_WORKING_SIGALTSTACK */
 #endif /* !PLATFORM_WIN32 */