2007-04-06 Andreas Faerber <andreas.faerber@web.de>

	* mini-amd64.h: fix for assertion failure on Solaris/amd64

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 682bd5bcea68e14bfb75634fbe67cf44a5afb96f..5a17ef2d3838d81508541fcbd11e059aead73428 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-06  Andreas Faerber  <andreas.faerber@web.de>
+
+       * mini-amd64.h: fix for assertion failure on Solaris/amd64
+
 2007-04-11  Martin Baulig  <martin@ximian.com>
 
        * mini.c (can_access_member): Fix handling of generic classes;

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index b9c1611709d01d9277a76715218cc519a7fa1833..7b2faabfba1edb77d351679bff63ff36250bfeaf 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -47,6 +47,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
 
 #ifdef sun    // Solaris x86
 #  undef SIGSEGV_ON_ALTSTACK
+#  define MONO_ARCH_NOMAP32BIT
 
 struct sigcontext {
         unsigned short gs, __gsh;