Tue Dec 12 16:28:15 CET 2006 Paolo Molaro <lupus@ximian.com>

	* mini-x86.c: enable on OSX, too, the code to return small
	structures in registers.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index ec567ed8ca6f83a995af21abbc03005258a2055b..59cbf6afbe3bca46ec30c3bbcd7ab55c6070a18d 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,4 +1,9 @@
 
+Tue Dec 12 16:28:15 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+       * mini-x86.c: enable on OSX, too, the code to return small
+       structures in registers.
+
 Mon Dec 11 19:22:35 CET 2006 Paolo Molaro <lupus@ximian.com>
 
        * mini-x86.c: remove the use of the dynamic code manager here, too.

diff --git a/mono/mini/mini-x86.c b/mono/mini/mini-x86.c
index 13c4d81bcba020b2323a3a0b9fdc6ffa93255f9c..bb7a4f215607848bcbad99c854743df8bac8fef4 100644 (file)
--- a/mono/mini/mini-x86.c
+++ b/mono/mini/mini-x86.c
@@ -113,7 +113,7 @@ typedef struct {
 
 static X86_Reg_No param_regs [] = { 0 };
 
-#ifdef PLATFORM_WIN32
+#if defined(PLATFORM_WIN32) || defined(__APPLE__)
 static X86_Reg_No return_regs [] = { X86_EAX, X86_EDX };
 #endif
 
@@ -179,7 +179,7 @@ add_valuetype (MonoMethodSignature *sig, ArgInfo *ainfo, MonoType *type,
        else 
                size = mono_type_stack_size (&klass->byval_arg, NULL);
 
-#ifdef PLATFORM_WIN32
+#if defined(PLATFORM_WIN32) || defined (__APPLE__)
        if (sig->pinvoke && is_return) {
                MonoMarshalType *info;