[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.4-3-3-gd3df8f5

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 337fd81680b27a15101ced25784ce08a9c93f5f2
Merge: f7ae451f152ad5ed91ad0b788a185f0ba0dd300a 854fa78b45d532884288ce8d5ad5d8e60ccc9ffe
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Aug 25 20:47:48 2011 +0200

    Merge commit 'upstream/2.10.5' into master-experimental

diff --combined configure.in
index e4a6d84,3343683..285381a
--- a/configure.in
+++ b/configure.in
@@@ -6,7 -6,7 +6,7 @@@ AC_CANONICAL_SYSTE
  m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
  
  AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(mono,2.10.4)
+ AM_INIT_AUTOMAKE(mono,2.10.5)
  AM_MAINTAINER_MODE
  
  API_VER=2.0
@@@ -128,17 -128,6 +128,17 @@@ case "$host" i
  		with_sigaltstack=no
  		use_sigposix=yes
  		;;
 +	*-*-kfreebsd*-gnu)
 +		platform_win32=no
 +		CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
 +		libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
 +		libmono_ldflags="-lpthread -pthread"
 +		libdl="-ldl"
 +		libgc_threads=pthreads
 +		need_link_unlink=yes
 +		with_sigaltstack=no
 +		use_sigposix=yes
 +		;;
  	*-*-*freebsd*)
  		host_win32=no
  		if test "x$PTHREAD_CFLAGS" = "x"; then
@@@ -2220,7 -2209,7 +2220,7 @@@ case "$host" i
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
 -		  darwin*|openbsd*|freebsd*)
 +		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  		        ;;
  		esac
@@@ -2235,7 -2224,7 +2235,7 @@@
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
 -		  darwin*|openbsd*|freebsd*)
 +		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  			;;
  		esac
@@@ -2566,11 -2555,6 +2566,11 @@@ case "$host" i
  	LIBC="libc.so.12"
  	INTL="libintl.so.0"
  	;;
 +     *-*-kfreebsd*-gnu)
 +	LIBC="libc.so.0.1"
 +	INTL="libc.so.0.1"
 +	X11="libX11.so.6"
 +	;;
      *-*-*freebsd*)
      	LIBC="libc.so"
  	INTL="libintl.so"
@@@ -2667,24 -2651,15 +2667,24 @@@ if test "x$with_tls" = "x__thread"; the
  	])
  fi
  
 -if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_build != xno; then
 +AC_ARG_WITH(fpu, [ --with-fpu=FPA,VFP,NONE    Select fpu to use on arm],[fpu=$withval])
 +
 +if test ${TARGET} = ARM; then
  	dnl ******************************************
  	dnl *** Check to see what FPU is available ***
  	dnl ******************************************
  	AC_MSG_CHECKING(which FPU to use)
  
 -	AC_TRY_COMPILE([], [
 -		__asm__ ("ldfd f0, [r0]");
 -		], fpu=FPA, fpu=NONE)
 +	if test "x$fpu" = "x"; then
 +
 +		AC_TRY_COMPILE([], [
 +			__asm__ ("ldfd f0, [r0]");
 +		], fpu=FPA, [
 +				AC_TRY_COMPILE([], [
 +					__asm__ ("fldd d0, [r0]");
 +				], fpu=VFP, fpu=NONE)
 +		])
 +	fi
  
  	AC_MSG_RESULT($fpu)
  	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
diff --combined mono/metadata/sgen-gc.h
index c60056c,88ab4ba..d01ef63
--- a/mono/metadata/sgen-gc.h
+++ b/mono/metadata/sgen-gc.h
@@@ -96,6 -96,10 +96,10 @@@ struct _SgenThreadInfo 
  	thread_port_t mach_port;
  #endif
  	
+ #if defined(PLATFORM_ANDROID)
+ 	void *android_tid;
+ #endif
+ 
  	unsigned int stop_count; /* to catch duplicate signals */
  	int signal;
  	int skip;
@@@ -195,7 -199,7 +199,7 @@@ struct _GCMemSection 
  
  typedef struct _SgenPinnedChunk SgenPinnedChunk;
  
 -#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
 +#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
  const static int suspend_signal_num = SIGXFSZ;
  #else
  const static int suspend_signal_num = SIGPWR;
@@@ -593,6 -597,7 +597,7 @@@ int mono_sgen_thread_handshake (int sig
  SgenThreadInfo* mono_sgen_thread_info_lookup (ARCH_THREAD_TYPE id) MONO_INTERNAL;
  SgenThreadInfo** mono_sgen_get_thread_table (void) MONO_INTERNAL;
  gboolean mono_sgen_suspend_thread (SgenThreadInfo *info) MONO_INTERNAL;
+ int mono_sgen_pthread_kill (SgenThreadInfo *info, int signum) MONO_INTERNAL;
  
  
  void mono_sgen_wait_for_suspend_ack (int count) MONO_INTERNAL;
diff --combined mono/tests/Makefile.am
index 88173ad,b7e661b..77be5eb
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@@ -338,6 -338,7 +338,6 @@@ BASE_TEST_CS_SRC=		
  	modules.cs	\
  	bug-81673.cs	\
  	bug-81691.cs	\
 -	bug-80307.cs	\
  	bug-415577.cs	\
  	filter-stack.cs	\
  	vararg2.cs	\
@@@ -863,6 -864,8 +863,8 @@@ test-generic-sharing-managed: test-runn
  test-generic-sharing:
  	@if test x$(M) != x; then $(MAKE) test-generic-sharing-managed; else $(MAKE) test-generic-sharing-normal; fi
  
+ EXTRA_DIST += delegate2.exe.config
+ 
  EXTRA_DIST += async-exceptions.cs
  async-exceptions.exe : async-exceptions.cs
  	$(MCS) -out:async-exceptions.exe $(srcdir)/async-exceptions.cs

-- 
mono