[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.4+dfsg-6-26-g8b65c7c
Mirco Bauer
meebey at meebey.net
Wed Aug 5 23:03:51 UTC 2009
The following commit has been merged in the master branch:
commit bd5bca06e2dddec5785961809c1565828f0513b9
Author: Mirco Bauer <meebey at meebey.net>
Date: Thu Jul 30 16:38:45 2009 +0200
* debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch
debian/patches/fix_disabling_aot_r131940.dpatch
debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
debian/patches/fix_recursive_unmanaged_types.dpatch
debian/patches/fix_sparc_support_r134797.dpatch:
+ Dropped, as already applied upstream.
diff --git a/debian/changelog b/debian/changelog
index 1626df2..9d72d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,13 @@ mono (2.4.2.3+dfsg-1~pre1) unstable; urgency=low
removed.
+ Includes ASP.NET MVC.
+ Updated xbuild.
+ * debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch
+ debian/patches/fix_disabling_aot_r131940.dpatch
+ debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
+ debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
+ debian/patches/fix_recursive_unmanaged_types.dpatch
+ debian/patches/fix_sparc_support_r134797.dpatch:
+ + Dropped, as already applied upstream.
* debian/rules
debian/mono-devel.install
debian/mono-api-diff.cs:
diff --git a/debian/patches/00list b/debian/patches/00list
index e6cd0e9..90f237f 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,12 +8,6 @@ fix-mono-cairo.pc.in
fix_BigInteger_overflow_CVE-2007-5197
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
-fix_sparc_support_r134797
-disable_unavailable_cpu_optimizations_r133647
-fix_disabling_aot_r131940
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
deleted file mode 100755
index 9e66fd7..0000000
--- a/debian/patches/disable_unavailable_cpu_optimizations_r133647.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /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);
diff --git a/debian/patches/fix_disabling_aot_r131940.dpatch b/debian/patches/fix_disabling_aot_r131940.dpatch
deleted file mode 100755
index 85157ff..0000000
--- a/debian/patches/fix_disabling_aot_r131940.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_disabling_aot_r131940.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 repository revision: 131940
-## DP: 2009-04-16 Zoltan Varga <vargaz at gmail.com>
-## DP: * aot-compiler.c (mono_xdebug_init): Fix the DISABLE_AOT build.
-
-diff -urNad git~/mono/mini/aot-compiler.c git/mono/mini/aot-compiler.c
---- git~/mono/mini/aot-compiler.c 2009-05-25 19:46:20.000000000 +0200
-+++ git/mono/mini/aot-compiler.c 2009-06-22 00:53:34.000000000 +0200
-@@ -6247,6 +6247,11 @@
- }
-
- void
-+mono_xdebug_init (void)
-+{
-+}
-+
-+void
- mono_save_xdebug_info (MonoMethod *method, guint8 *code, guint32 code_size, MonoInst **args, GSList *unwind_info)
- {
- }
diff --git a/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch b/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
deleted file mode 100755
index f6781fc..0000000
--- a/debian/patches/fix_null_funcptr_marshalling_r127347.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
---- mono/mono/metadata/marshal.c 2009-02-18 23:10:16 UTC (rev 127346)
-+++ mono/mono/metadata/marshal.c 2009-02-18 23:12:09 UTC (rev 127347)
-@@ -383,6 +383,9 @@
- #endif
- MonoDelegate *d;
-
-+ if (ftn == NULL)
-+ return NULL;
-+
- mono_marshal_lock ();
- if (delegate_hash_table == NULL)
- delegate_hash_table = delegate_hash_table_new ();
-
-
diff --git a/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch b/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
deleted file mode 100755
index 4cd2596..0000000
--- a/debian/patches/fix_ppc_build_using_gcc-4.4_r131472.dpatch
+++ /dev/null
@@ -1,33 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_ppc_build_using_gcc-4.4_r131472.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: r131472
-## DP: 2009-04-10 Zoltan Varga <vargaz at gmail.com>
-## DP: * include/private/gc_locks.h (GC_test_and_set): Merge a change from libgc
-## DP: libatomic-ops to fix the ppc build with gcc 4.4.
-
- at DPATCH@
-diff -urNad mono-2.4+dfsg~/libgc/include/private/gc_locks.h mono-2.4+dfsg/libgc/include/private/gc_locks.h
---- mono-2.4+dfsg~/libgc/include/private/gc_locks.h 2009-02-14 00:32:31.000000000 +0100
-+++ mono-2.4+dfsg/libgc/include/private/gc_locks.h 2009-06-13 14:14:44.000000000 +0200
-@@ -160,15 +160,15 @@
- int temp = 1; /* locked value */
-
- __asm__ __volatile__(
-- "1:\tlwarx %0,0,%3\n" /* load and reserve */
-+ "1:\tlwarx %0,0,%1\n" /* load and reserve */
- "\tcmpwi %0, 0\n" /* if load is */
- "\tbne 2f\n" /* non-zero, return already set */
- "\tstwcx. %2,0,%1\n" /* else store conditional */
- "\tbne- 1b\n" /* retry if lost reservation */
- "\tsync\n" /* import barrier */
- "2:\t\n" /* oldval is zero if we set */
-- : "=&r"(oldval), "=p"(addr)
-- : "r"(temp), "1"(addr)
-+ : "=&r"(oldval)
-+ : "r"(addr), "r"(temp)
- : "cr0","memory");
- return oldval;
- }
-y
\ No newline at end of file
diff --git a/debian/patches/fix_recursive_unmanaged_types.dpatch b/debian/patches/fix_recursive_unmanaged_types.dpatch
deleted file mode 100755
index 3da05c1..0000000
--- a/debian/patches/fix_recursive_unmanaged_types.dpatch
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_recursive_unmanaged_types.dpatch by Mirco Bauer <meebey at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch takes from upstream's SVN, revision 132861
-## DP: 2009-04-28 Marek Safar <marek.safar at gmail.com>
-## DP: A fix for bug #495112
-## DP: * class.cs (IsUnmanagedType): Handle recursive unmanaged types using
-## DP: local cache.
-
- at DPATCH@
-diff -urNad mono-2.4+dfsg~/mcs/mcs/class.cs mono-2.4+dfsg/mcs/mcs/class.cs
---- mono-2.4+dfsg~/mcs/mcs/class.cs 2009-03-09 17:52:16.000000000 +0100
-+++ mono-2.4+dfsg/mcs/mcs/class.cs 2009-05-19 00:10:18.000000000 +0200
-@@ -2914,6 +2914,9 @@
- }
-
- public sealed class Struct : ClassOrStruct {
-+
-+ bool is_unmanaged, has_unmanaged_check_done;
-+
- // <summary>
- // Modifiers allowed in a struct declaration
- // </summary>
-@@ -2973,6 +2976,11 @@
- if (requires_delayed_unmanagedtype_check)
- return true;
-
-+ if (has_unmanaged_check_done)
-+ return is_unmanaged;
-+
-+ has_unmanaged_check_done = true;
-+
- foreach (FieldBase f in fields) {
- if ((f.ModFlags & Modifiers.STATIC) != 0)
- continue;
-@@ -2981,6 +2989,7 @@
- // struct S { S* s; }
- Type mt = f.MemberType;
- if (mt == null) {
-+ has_unmanaged_check_done = false;
- requires_delayed_unmanagedtype_check = true;
- return true;
- }
-@@ -2997,6 +3006,7 @@
- return false;
- }
-
-+ is_unmanaged = true;
- return true;
- }
-
diff --git a/debian/patches/fix_sparc_support_r134797.dpatch b/debian/patches/fix_sparc_support_r134797.dpatch
deleted file mode 100755
index a2f8aff..0000000
--- a/debian/patches/fix_sparc_support_r134797.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /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
More information about the Pkg-mono-svn-commits
mailing list