[Pkg-mono-svn-commits] rev 2050 - in mono/trunk/debian: . patches

[Mirco Bauer]

Author: meebey-guest
Date: 2005-10-02 15:18:18 +0000 (Sun, 02 Oct 2005)
New Revision: 2050

Added:
   mono/trunk/debian/patches/64bit_implicit_pointer_cast_fix.dpatch
   mono/trunk/debian/patches/amd64_compile_fix_r50553.dpatch
Modified:
   mono/trunk/debian/changelog
   mono/trunk/debian/patches/00list
Log:
- 64bit fixes.



Modified: mono/trunk/debian/changelog
===================================================================
--- mono/trunk/debian/changelog	2005-10-02 12:24:00 UTC (rev 2049)
+++ mono/trunk/debian/changelog	2005-10-02 15:18:18 UTC (rev 2050)
@@ -1,3 +1,17 @@
+mono (1.1.9.1-2pre0) unstable; urgency=medium
+
+  * NOT RELEASED YET
+  * Mirco 'meebey' Bauer
+    + debian/patches/amd64_compile_fix_r50553.dpatch:
+      - Backport from upstream's SVN, should fix amd64 build.
+        (Closes: #330369)
+    + debian/patches/64bit_implicit_pointer_cast_fix.dpatch:
+      - Should fix problems with amd64 and ia64 build.
+        (Closes: #330982, thanks to David Mosberger-Tang
+         <David.Mosberger at acm.org> for the patch)
+
+ -- Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>  Sun, 2 Oct 2005 17:17:19 +0200
+
 mono (1.1.9.1-2) unstable; urgency=medium
 
   * Mirco 'meebey' Bauer

Modified: mono/trunk/debian/patches/00list
===================================================================
--- mono/trunk/debian/patches/00list	2005-10-02 12:24:00 UTC (rev 2049)
+++ mono/trunk/debian/patches/00list	2005-10-02 15:18:18 UTC (rev 2050)
@@ -2,3 +2,5 @@
 datetime_doparse_fix
 s390_compile_fix
 io_layer_fix_r50689
+amd64_compile_fix_r50553
+64bit_implicit_pointer_cast_fix

Added: mono/trunk/debian/patches/64bit_implicit_pointer_cast_fix.dpatch
===================================================================
--- mono/trunk/debian/patches/64bit_implicit_pointer_cast_fix.dpatch	2005-10-02 12:24:00 UTC (rev 2049)
+++ mono/trunk/debian/patches/64bit_implicit_pointer_cast_fix.dpatch	2005-10-02 15:18:18 UTC (rev 2050)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64bit_implicit_pointer_cast_fix.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.1.9.1~/mono/dis/get.h mono-1.1.9.1/mono/dis/get.h
+--- mono-1.1.9.1~/mono/dis/get.h	2005-08-25 17:12:40.000000000 +0200
++++ mono-1.1.9.1/mono/dis/get.h	2005-10-02 16:53:55.000000000 +0200
+@@ -44,6 +44,7 @@
+ char *dis_stringify_method_signature (MonoImage *m, MonoMethodSignature *method, int methoddef_row,
+ 				      MonoGenericContext *context, gboolean fully_qualified);
+ char *dis_stringify_function_ptr (MonoImage *m, MonoMethodSignature *method);
++char *dis_stringify_marshal_spec (MonoMarshalSpec *spec);
+ 
+ guint32 method_dor_to_token (guint32 idx);
+ 


Property changes on: mono/trunk/debian/patches/64bit_implicit_pointer_cast_fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Added: mono/trunk/debian/patches/amd64_compile_fix_r50553.dpatch
===================================================================
--- mono/trunk/debian/patches/amd64_compile_fix_r50553.dpatch	2005-10-02 12:24:00 UTC (rev 2049)
+++ mono/trunk/debian/patches/amd64_compile_fix_r50553.dpatch	2005-10-02 15:18:18 UTC (rev 2050)
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## amd64_compile_fix_r50553.dpatch by Mirco Bauer <meebey at meebey.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad mono-1.1.9.1~/mono/utils/ChangeLog mono-1.1.9.1/mono/utils/ChangeLog
+--- mono-1.1.9.1~/mono/utils/ChangeLog	2005-09-07 21:56:14.000000000 +0200
++++ mono-1.1.9.1/mono/utils/ChangeLog	2005-09-28 11:33:19.000000000 +0200
+@@ -1,3 +1,7 @@
++2005-09-12  Zoltan Varga  <vargaz at freemail.hu>
++
++	* mono-compiler.h (MONO_THREAD_VAR_OFFSET): Fix compilation on amd64
++	with recent binutils.
+ 
+ Wed Sep 7 21:23:18 BST 2005 Paolo Molaro <lupus at ximian.com>
+ 
+diff -urNad mono-1.1.9.1~/mono/utils/mono-compiler.h mono-1.1.9.1/mono/utils/mono-compiler.h
+--- mono-1.1.9.1~/mono/utils/mono-compiler.h	2005-08-27 16:36:10.000000000 +0200
++++ mono-1.1.9.1/mono/utils/mono-compiler.h	2005-09-28 11:33:19.000000000 +0200
+@@ -27,7 +27,7 @@
+ #if defined(PIC)
+ #define MONO_THREAD_VAR_OFFSET(var,offset) (offset) = -1
+ #else
+-#define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("jmp 1f; .section writetext, \"awx\"; 1: movl $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=r" (offset));
++#define MONO_THREAD_VAR_OFFSET(var,offset) do { guint64 foo;  __asm ("jmp 1f; .section writetext, \"awx\"; 1: movq $" #var "@TPOFF, %0; jmp 2f; .previous; 2:" : "=a" (foo)); offset = foo; } while (0);
+ #endif
+ #elif defined(__ia64__) && !defined(__INTEL_COMPILER)
+ #define MONO_THREAD_VAR_OFFSET(var,offset) __asm ("addl %0 = @tprel(" #var "#), r0 ;;\n" : "=r" (offset));


Property changes on: mono/trunk/debian/patches/amd64_compile_fix_r50553.dpatch
___________________________________________________________________
Name: svn:executable
   + *