[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-1-3-g2a2dc27

[Jo Shields]

The following commit has been merged in the master-experimental branch:
commit bc3782ddb49c4f5f9876ea5df008830b15f7e226
Merge: bd0fdf8a175dfaaa75b99517acc523a185c6b581 378d7a045addeef6cd3bfe12bf14f3f47fd7d89e
Author: Jo Shields <directhex at apebox.org>
Date:   Tue Jun 22 08:53:13 2010 +0100

    Merge branch 'debian/patches/kfreebsd_support' into master-experimental

diff --combined configure.in
index b7266de,4280f97..456aa97
--- a/configure.in
+++ b/configure.in
@@@ -125,6 -125,7 +125,7 @@@ case "$host" i
  		libgc_threads=pthreads
  		need_link_unlink=yes
  		with_sigaltstack=no
+ 		use_sigposix=yes
  		;;
  	*-*-*freebsd*)
  		platform_win32=no
@@@ -2313,24 -2314,15 +2314,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"

-- 
mono