[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.7-5-60-gcb9cfec

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit aa5391a02a02b8fac117e096e9559a5e395300d3
Merge: e618805c8b0b0dce0e2a3a70db5b3f94897345c0 9a320e5f988c513824c09bc1dd6414dc8d7cd942
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Mar 15 21:19:16 2011 +0100

    Merge branch 'upstream-experimental' into master-experimental

diff --combined Makefile.am
index af5403b,b507915..51ae627
--- a/Makefile.am
+++ b/Makefile.am
@@@ -4,7 -4,7 +4,7 @@@ ACLOCAL_AMFLAGS = -I 
  MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
  
  if CROSS_COMPILING
 -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
 +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc
  # Keep in sync with SUBDIRS
  ## 'tools' is not normally built
  DIST_SUBDIRS = po libgc eglib mono ikvm-native         data runtime scripts man samples tools msvc docs
@@@ -12,14 -12,23 +12,23 @@@ els
  if ONLY_MOONLIGHT
  SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
  else
 -SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
 +SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc
  # Keep in sync with SUBDIRS
  ## 'tools' is not normally built
  DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
  endif
  endif
  
- EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh 
+ EXTRA_DIST= \
+ 	    LICENSE \
+ 	    autogen.sh \
+ 	    build-mingw32.sh \
+ 	    mkinstalldirs \
+ 	    mono-uninstalled.pc.in \
+ 	    nls.m4 \
+ 	    po.m4 \
+ 	    progtest.m4 \
+ 	    winconfig.h
  
  DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
  
diff --combined configure.in
index 54043da,d20b1ff..6bcf5e2
--- 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)
+ AM_INIT_AUTOMAKE(mono,2.10.1)
  AM_MAINTAINER_MODE
  
  API_VER=2.0
@@@ -851,6 -851,14 +851,14 @@@ case "x$gc" i
  		if test "x$found_gc_enable" = "xyes"; then
  			BOEHM_DEFINES="-DHAVE_GC_ENABLE $BOEHM_DEFINES"
  		fi
+ 
+ 		# check whether we need to explicitly allow
+                	# thread registering
+                	AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
+                	if test "x$found_allow_register_threads" = "xyes"; then
+                         AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
+                	fi
+ 
  		;;
  
  	xincluded)
@@@ -1746,6 -1754,11 +1754,11 @@@ if test x$target_win32 = xno; the
  	dnl * on xp+
  	AC_DEFINE(HAVE_GETPROCESSID, 1, [Define if GetProcessId is available])
  else
+ 	dnl *********************************
+ 	dnl *** Checks for Windows compilation ***
+ 	dnl *********************************
+ 	AC_CHECK_HEADERS(winternl.h)
+ 
  	jdk_headers_found=no
  	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
  	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
@@@ -2535,24 -2548,15 +2548,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"
@@@ -2885,6 -2889,7 +2898,7 @@@ data/net_4_0/Makefil
  data/net_2_0/Browsers/Makefile
  data/mint.pc
  data/mono-2.pc
+ data/monosgen-2.pc
  data/mono.pc
  data/mono-cairo.pc
  data/mono-nunit.pc
diff --combined mono/tests/Makefile.am
index 3a5734a,b081b63..15f7c0b
--- 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	\
@@@ -375,7 -376,8 +375,8 @@@
  TEST_CS_SRC_DIST=	\
  	$(BASE_TEST_CS_SRC)	\
  	async-exc-compilation.cs \
- 	filter-stack.cs
+ 	filter-stack.cs	\
+ 	finally_guard.cs
  
  TEST_CS_SRC_GEN = \
  	runtime-invoke.gen.cs \

-- 
mono