Author: zoltan
Date: 2005-04-20 09:25:56 -0400 (Wed, 20 Apr 2005)
New Revision: 43326
Modified:
trunk/mono/mono/mini/ChangeLog
trunk/mono/mono/mini/aot.c
Log:
2005-04-20 Zoltan Varga <[EMAIL PROTECTED]>
* aot.c: Applied patch from "The Software Team" <[EMAIL PROTECTED]>.
Make AOT compilation
work on windows.
Modified: trunk/mono/mono/mini/ChangeLog
===================================================================
--- trunk/mono/mono/mini/ChangeLog 2005-04-20 12:49:15 UTC (rev 43325)
+++ trunk/mono/mono/mini/ChangeLog 2005-04-20 13:25:56 UTC (rev 43326)
@@ -1,4 +1,8 @@
+2005-04-20 Zoltan Varga <[EMAIL PROTECTED]>
+ * aot.c: Applied patch from "The Software Team" <[EMAIL PROTECTED]>.
Make AOT compilation
+ work on windows.
+
Mon Apr 18 16:20:32 CEST 2005 Paolo Molaro <[EMAIL PROTECTED]>
* exceptions-ppc.c: update code to handle stack traces (fixes bug
#74452).
Modified: trunk/mono/mono/mini/aot.c
===================================================================
--- trunk/mono/mono/mini/aot.c 2005-04-20 12:49:15 UTC (rev 43325)
+++ trunk/mono/mono/mini/aot.c 2005-04-20 13:25:56 UTC (rev 43326)
@@ -1185,6 +1185,8 @@
#if defined(sparc)
fprintf (fp, "\t.type %s,#%s\n", name, stype);
+#elif defined(PLATFORM_WIN32)
+
#elif !(defined(__ppc__) && defined(__MACH__))
fprintf (fp, "\t.type %s,@%s\n", name, stype);
#elif defined(__x86_64__) || defined(__i386__)
@@ -1195,7 +1197,7 @@
static void
emit_global (FILE *fp, const char *name, gboolean func)
{
-#if defined(__ppc__) && defined(__MACH__)
+#if (defined(__ppc__) && defined(__MACH__)) || defined(PLATFORM_WIN32)
// mach-o always uses a '_' prefix.
fprintf (fp, "\t.globl _%s\n", name);
#else
@@ -1208,12 +1210,17 @@
static void
emit_label (FILE *fp, const char *name)
{
-#if defined(__ppc__) && defined(__MACH__)
+#if (defined(__ppc__) && defined(__MACH__)) || defined(PLATFORM_WIN32)
// mach-o always uses a '_' prefix.
fprintf (fp, "_%s:\n", name);
#else
fprintf (fp, "%s:\n", name);
#endif
+
+#if defined(PLATFORM_WIN32)
+ /* Emit a normal label too */
+ fprintf (fp, "%s:\n", name);
+#endif
}
static void
@@ -2282,6 +2289,7 @@
com = g_strdup_printf ("as -xarch=v9 %s -o %s.o", tmpfname, tmpfname);
#else
com = g_strdup_printf ("as %s -o %s.o", tmpfname, tmpfname);
+
#endif
printf ("Executing the native assembler: %s\n", com);
if (system (com) != 0) {
@@ -2302,6 +2310,8 @@
com = g_strdup_printf ("ld -shared -G -o %s %s.o", outfile_name,
tmpfname);
#elif defined(__ppc__) && defined(__MACH__)
com = g_strdup_printf ("gcc -dynamiclib -o %s %s.o", outfile_name,
tmpfname);
+#elif defined(PLATFORM_WIN32)
+ com = g_strdup_printf ("gcc -shared --dll -mno-cygwin -o %s %s.o",
outfile_name, tmpfname);
#else
com = g_strdup_printf ("ld -shared -o %s %s.o", outfile_name, tmpfname);
#endif
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
