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

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit a31676f884f357d2502a9f416e5c6fcdfb36feb0
Merge: aba0fce2abd5627084f2e943364b31fb172d571b 66a0541902977b713401115829609a314575dbba
Author: Mirco Bauer <meebey at meebey.net>
Date:   Thu Apr 7 01:32:11 2011 +0200

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

diff --combined configure.in
index 6bcf5e2,b2b6dd3..b87e786
--- a/configure.in
+++ b/configure.in
@@@ -127,6 -127,17 +127,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
@@@ -2452,6 -2463,11 +2463,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"
@@@ -2548,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