[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 1b3fc2b5dc840af92bee7d31877314f18356897a
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Jun 13 14:29:30 2009 +0200

      * debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch:
        + Disable CPU optimizations which might be unavailable (like SSE2 on
          Pentium 3).

diff --git a/debian/changelog b/debian/changelog
index e9547b2..133c8c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ mono (2.4+dfsg-3) unstable; urgency=low
       Suggests for libmono-system-data{1,2}.0-cil up. (Closes: #531870)
   * debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch:
     + Fixes the build on PPC when using GCC 4.4.
+  * debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch:
+    + Disable CPU optimizations which might be unavailable (like SSE2 on
+      Pentium 3).
 
  -- 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 f7c91d1..8a16b23 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -10,6 +10,8 @@ fix_implicit_pointer_conversions
 fix_NetworkInterface_endless_loop
 fix_null_funcptr_marshalling_r127347
 fix_recursive_unmanaged_types
+fix_ppc_build_using_gcc-4.4_r131472
+disable_unavailable_cpu_optimizations_r133647
 fix_mono-api-info_build
 fix_csharplib_build
 fix_mdoc_build
diff --git a/debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch b/debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch
new file mode 100755
index 0000000..9e66fd7
--- /dev/null
+++ b/debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## disable_unavailable_cpu_optimizations_r133647.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: r133647
+## DP: 2009-05-06  Zoltan Varga  <vargaz at gmail.com>
+## DP: * driver.c (mini_regression): Disable optimizations not supported by
+## DP:   the cpu. Fixes #500019.
+
+ at DPATCH@
+diff -urNad mono-2.4+dfsg~/mono/mini/driver.c mono-2.4+dfsg/mono/mini/driver.c
+--- mono-2.4+dfsg~/mono/mini/driver.c	2009-02-14 00:34:26.000000000 +0100
++++ mono-2.4+dfsg/mono/mini/driver.c	2009-06-13 14:25:52.000000000 +0200
+@@ -341,6 +341,9 @@
+ 	TestMethod func;
+ 	GTimer *timer = g_timer_new ();
+ 	MonoDomain *domain = mono_domain_get ();
++	guint32 exclude = 0;
++
++	mono_arch_cpu_optimizazions (&exclude);
+ 
+ 	if (mini_stats_fd) {
+ 		fprintf (mini_stats_fd, "$stattitle = \'Mono Benchmark Results (various optimizations)\';\n");
+@@ -381,7 +384,7 @@
+ 	for (opt = 0; opt < G_N_ELEMENTS (opt_sets); ++opt) {
+ 		double elapsed, comp_time, start_time;
+ 
+-		opt_flags = opt_sets [opt];
++		opt_flags = opt_sets [opt] & ~exclude;
+ 		mono_set_defaults (verbose, opt_flags);
+ 		n = opt_descr (opt_flags);
+ 		g_print ("Test run: image=%s, opts=%s\n", mono_image_get_filename (image), n);

-- 
mono