[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-2-8-g49634c6

[Mirco Bauer]

The following commit has been merged in the master branch:
commit 49634c6e69361111c70dbfe0263643d4a184cc05
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 14:38:57 2009 +0200

      * debian/patches/fix_sparc_support_r134797.patch:
        + Fixes the hang for all applications when running on SPARC.
          (Closes: #531566)

diff --git a/debian/changelog b/debian/changelog
index 133c8c1..e2c80fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ mono (2.4+dfsg-3) unstable; urgency=low
   * debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch:
     + Disable CPU optimizations which might be unavailable (like SSE2 on
       Pentium 3).
+  * debian/patches/fix_sparc_support_r134797.patch:
+    + Fixes the hang for all applications when running on SPARC.
+      (Closes: #531566)
 
  -- Mirco Bauer <meebey at debian.org>  Mon, 25 May 2009 20:46:12 +0200
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 8a16b23..ffb1d9d 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -11,6 +11,7 @@ fix_NetworkInterface_endless_loop
 fix_null_funcptr_marshalling_r127347
 fix_recursive_unmanaged_types
 fix_ppc_build_using_gcc-4.4_r131472
+fix_sparc_support_r134797
 disable_unavailable_cpu_optimizations_r133647
 fix_mono-api-info_build
 fix_csharplib_build
diff --git a/debian/patches/fix_sparc_support_r134797.dpatch b/debian/patches/fix_sparc_support_r134797.dpatch
new file mode 100755
index 0000000..a2f8aff
--- /dev/null
+++ b/debian/patches/fix_sparc_support_r134797.dpatch
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_sparc_support_r134797.dpatch by Mirco Bauer <meebey at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch taken from upstream's SVN, revision: r134797
+## DP: 2009-05-26  Zoltan Varga  <vargaz at gmail.com>
+## DP: * mini-sparc.c (add_outarg_load): Fix the sparc build.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/mono/mini/mini-sparc.c mono-2.4+dfsg/mono/mini/mini-sparc.c
+--- mono-2.4+dfsg~/mono/mini/mini-sparc.c	2009-02-14 00:34:26.000000000 +0100
++++ mono-2.4+dfsg/mono/mini/mini-sparc.c	2009-06-13 14:33:43.000000000 +0200
+@@ -1080,11 +1080,9 @@
+ static void
+ add_outarg_load (MonoCompile *cfg, MonoCallInst *call, int opcode, int basereg, int offset, int reg)
+ {
+-	MonoInst *arg;
+ 	int dreg = mono_alloc_ireg (cfg);
+ 
+-	EMIT_NEW_LOAD_MEMBASE (cfg, arg, OP_LOAD_MEMBASE, dreg, sparc_sp, offset);
+-	MONO_ADD_INS (cfg->cbb, arg);
++    MONO_EMIT_NEW_LOAD_MEMBASE (cfg, dreg, sparc_sp, offset);
+ 
+ 	mono_call_inst_add_outarg_reg (cfg, call, dreg, reg, FALSE);
+ }

-- 
mono