Description: Remove ARMV6 ASM check from configure
 Remove the ARMV6 ASM check from configure{,.in}, since our build
 hosts aren't the same architecture as our target, and hardcode
 an arm*-linux-gnueabihf target that enables ARMV6 unconditionally.
Author: Adam Conrad <adconrad@ubuntu.com>
Forwarded: no

--- mono-2.10.8.1.orig/configure.in
+++ mono-2.10.8.1/configure.in
@@ -2348,6 +2348,17 @@ case "$host" in
 	    NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
 		sgen_supported=true
 		;;
+	arm*-linux-gnueabihf)
+		TARGET=ARM;
+		arch_target=arm;
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=yes
+		jit_wanted=true
+		sgen_supported=true
+		CPPFLAGS="$CPPFLAGS -DHAVE_ARMV6=1"
+		# libgc's gc_locks.h depends on this
+		NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
+		;;
 	arm*-linux*)
 		TARGET=ARM;
 		arch_target=arm;
@@ -2693,18 +2704,6 @@ if test ${TARGET} = ARM; then
 	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-2.10.8.1.orig/configure
+++ mono-2.10.8.1/configure
@@ -23087,6 +23087,17 @@ fi
 	    NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
 		sgen_supported=true
 		;;
+	arm*-linux-gnueabihf)
+		TARGET=ARM;
+		arch_target=arm;
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=yes
+		jit_wanted=true
+		sgen_supported=true
+		CPPFLAGS="$CPPFLAGS -DHAVE_ARMV6=1"
+		# libgc's gc_locks.h depends on this
+		NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
+		;;
 	arm*-linux*)
 		TARGET=ARM;
 		arch_target=arm;
@@ -23746,40 +23757,6 @@ rm -f core conftest.err conftest.$ac_obj
 $as_echo "$fpu" >&6; }
 	CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1"
 	unset fpu
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARMV6" >&5
-$as_echo_n "checking for ARMV6... " >&6; }
-	if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		int main () { __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" : : "r" (0) : "memory"); return 0; }
-
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  armv6=yes
-else
-  armv6=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $armv6" >&5
-$as_echo "$armv6" >&6; }
-	if test ${armv6} = yes; then
-
-$as_echo "#define HAVE_ARMV6 1" >>confdefs.h
-
-	   # libgc's gc_locks.h depends on this
-	   NESTED_LIBGC_FLAGS="$NESTED_LIBGC_FLAGS -DHAVE_ARMV6"
-	fi
 fi
 
 if test ${TARGET} = unknown; then
