[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954
Mirco Bauer
meebey at meebey.net
Thu Aug 12 01:18:55 UTC 2010
The following commit has been merged in the master-experimental branch:
commit c3d3f41e9c678ab3d6553746d57a57b42e56c670
Merge: 2bd4ed126e5b11d8a27c59c5fd4b63f7c8169955 d7722ae95db3623cb55bf444307f54dd36917381
Author: Mirco Bauer <meebey at meebey.net>
Date: Tue Aug 3 01:08:37 2010 +0200
Merge branch 'debian/patches/kfreebsd_support' into merge/2.6.7
diff --combined configure.in
index 6a23c8a,21dd728..fee9ac7
--- a/configure.in
+++ b/configure.in
@@@ -116,6 -116,17 +116,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*)
platform_win32=no
if test "x$PTHREAD_CFLAGS" = "x"; then
@@@ -2272,6 -2283,11 +2283,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"
@@@ -2357,24 -2373,15 +2373,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
More information about the Pkg-mono-svn-commits
mailing list