[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-2-4-g68c4b79

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit af1a1d3482db1dd925c43aa6ff80fe859fa3c77d
Merge: 571c0216bc5ea4adc87b27573d037c5a9d229e89 0fd2fc1844b7cb793e720c4b387b96e30492b0b8
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sat Apr 9 13:23:33 2011 +0200

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

diff --combined configure.in
index b87e786,3204caf..63b9d5b
--- a/configure.in
+++ b/configure.in
@@@ -2155,7 -2155,7 +2155,7 @@@ case "$host" i
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
- 		  darwin*|openbsd*|freebsd*)
+ 		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  		        ;;
  		esac
@@@ -2170,7 -2170,7 +2170,7 @@@
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
- 		  darwin*|openbsd*|freebsd*)
+ 		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  			;;
  		esac
@@@ -2564,24 -2564,15 +2564,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