[Pkg-mono-svn-commits] [SCM] mono branch, master, updated. debian/2.6.7-3-34-gb2ddb4c

[Mirco Bauer]

The following commit has been merged in the master branch:
commit c6a5faba9c959906eb905071f313780e6edac0c2
Merge: 064761c27271bc6b6c7715434a1a7cb5c8afa282 f17ab0443403459432d441c41612c844ca673b4c
Author: Mirco Bauer <meebey at meebey.net>
Date:   Mon Dec 6 23:10:57 2010 +0100

    Merge branch 'debian/patches/fix_soft_debugger_segfault_with_sse4.2'

diff --combined mono/mini/mini-amd64.h
index 4387deb,8cf61a7..ec5a2fd
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@@ -282,7 -282,7 +282,7 @@@ typedef struct 
  
  #define MONO_ARCH_NOMAP32BIT
  
 -#elif defined (__FreeBSD__)
 +#elif defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
  
  #define REG_RAX 7
  #define REG_RCX 4
@@@ -376,8 -376,7 +376,7 @@@
  #define MONO_ARCH_DYN_CALL_PARAM_AREA 0
  
  #define MONO_ARCH_HAVE_LLVM_IMT_TRAMPOLINE 1
- 
- #define MONO_ARCH_USE_OP_TAIL_CALL(caller_sig, callee_sig) mono_metadata_signature_equal ((caller_sig), (callee_sig))
+ #define MONO_ARCH_HAVE_SETUP_RESUME_FROM_SIGNAL_HANDLER_CTX 1
  
  /* Used for optimization, not complete */
  #define MONO_ARCH_IS_OP_MEMBASE(opcode) ((opcode) == OP_X86_PUSH_MEMBASE)

-- 
mono