[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.10.1-3-7-g9546eb7

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 8e1cd4687619084c05fc77c034f4d2e513becb00
Merge: 68c4b792ea2377240d4c917fcd28a69dae39c434 cf1d8e8f167dce8bcde34f54fa0d12bf74758ffd
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Apr 10 16:58:55 2011 +0200

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

diff --combined configure.in
index 63b9d5b,b262edf..92f35ed
--- a/configure.in
+++ b/configure.in
@@@ -127,17 -127,6 +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
@@@ -2155,7 -2144,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 -2159,7 +2170,7 @@@
  			sgen_supported=true
  			AOT_SUPPORTED="yes"
  			;;
 -		  darwin*|openbsd*|freebsd*)
 +		  darwin*|openbsd*|freebsd*|kfreebsd-gnu*)
  			sgen_supported=true
  			;;
  		esac
@@@ -2463,11 -2452,6 +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"
@@@ -2564,28 -2548,31 +2564,40 @@@ 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"
  	unset fpu
+ 
+ 	AC_MSG_CHECKING(for ARMV6)
+ 	AC_TRY_RUN([
+ 		int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; }
+ 			], armv6=yes, armv6=no)
+ 
+ 	AC_MSG_RESULT($armv6)
+ 	if test ${armv6} = yes; then
+ 	   AC_DEFINE(HAVE_ARMV6, 1, "Host supports ARMV6 instructions")
+ 	   # libgc's gc_locks.h depends on this
+ 	   NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
+ 	fi
  fi
  
  if test ${TARGET} = unknown; then

-- 
mono