[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.3-1-10-g2facb58

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 6d4b9b9dc77ec8f31097a10fb213f34272f5c197
Merge: 113d0f06452966a00c195eaf75404ce37baaa7ce 5157df7f461892cea1eb345bc4ecf6ec1ddb8e6c
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Aug 11 21:29:11 2011 +0200

    Merge branch 'merge/2.10.4' into master-experimental

diff --combined configure.in
index 40d0d9c,92c3bb7..e4a6d84
--- 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.3)
+ AM_INIT_AUTOMAKE(mono,2.10.4)
  AM_MAINTAINER_MODE
  
  API_VER=2.0
@@@ -2667,24 -2667,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"

-- 
mono