X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=ceeb3bda568de22785723ba2869093002d8c385c;hb=9f6fa83d53ec04dde5c07d21ca3a640024e00095;hp=47719144fa688b22a0fb8abc2193a4f14fd19a35;hpb=581d84c14037d0ceac3324ed5cf829571d8e84f9;p=mono.git

diff --git a/configure.in b/configure.in
index 47719144fa6..ceeb3bda568 100644
--- a/configure.in
+++ b/configure.in
@@ -248,12 +248,12 @@ case "$host" in
 		if test "x$cross_compiling" = "xyes"; then
 			has_broken_apple_cpp=yes
 		fi
-		dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin10.0.0, but
+		dnl Snow Leopard is horribly broken -- it reports itself as i386-apple-darwin*, but
 		dnl its gcc defaults to 64-bit mode.  They have also deprecated the usage of ucontext
 		dnl we need to set some flags to build our 32-bit binaries on 10.6 properly
 		case "$host" in
-			dnl Snow Leopard config.guess reports as this
-			i*86-*-darwin10*)
+			dnl Snow Leopard and newer config.guess reports as this
+			i*86-*-darwin*)
 				BROKEN_DARWIN_FLAGS="-arch i386 -D_XOPEN_SOURCE -mmacosx-version-min=10.5"
 				CPPFLAGS="$CPPFLAGS $BROKEN_DARWIN_FLAGS"
 				CFLAGS="$CFLAGS $BROKEN_DARWIN_FLAGS"
@@ -1547,6 +1547,12 @@ if test x$target_win32 = xno; then
 		AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
 	fi
 
+	havekqueue=no
+        AC_CHECK_FUNCS(kqueue, , AC_MSG_CHECKING(for kqueue in sys/event.h)
+                AC_TRY_LINK([#include <sys/event.h>], 
+                [ kqueue(); ], 
+                AC_DEFINE(HAVE_KQUEUE, 1, [Have kqueue]) AC_MSG_RESULT(yes),
+                AC_MSG_RESULT(no)))
 	dnl ******************************
 	dnl *** Checks for SIOCGIFCONF ***
 	dnl ******************************
@@ -2241,7 +2247,7 @@ case "$host" in
 		arch_target=arm;
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
-		CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1"
+		CPPFLAGS="$CPPFLAGS -DARM_FPU_VFP=1 -D__ARM_EABI__ -DHAVE_ARMV6=1"
 		sgen_supported=true
 		;;
 	arm*-linux*)
@@ -2327,6 +2333,9 @@ POWERPC64)
 	AC_DEFINE(TARGET_POWERPC, 1, [...])
 	AC_DEFINE(TARGET_POWERPC64, 1, [...])
 	;;
+S390x)
+	AC_DEFINE(TARGET_S390X, 1, [...])
+	;;
 esac
 
 if test "x$sizeof_register" = "x4"; then
@@ -2530,6 +2539,16 @@ if test ${TARGET} = ARM && test x$cross_compiling = xno && test x$enable_mcs_bui
 	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")
+	fi
 fi
 
 if test ${TARGET} = unknown; then