André Hentschel : configure: Downgrade the Thumb2 requirement to Thumb on ARM.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 74518c8d0472c6e494823d22291fc32cdc2a612d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=74518c8d0472c6e494823d2229...

Author: André Hentschel <nerv(a)dawncrow.de>
Date:   Mon Jun 25 00:22:16 2012 +0200

configure: Downgrade the Thumb2 requirement to Thumb on ARM.

---

 configure    |    8 ++++----
 configure.ac |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 465bdc4..2a26441 100755
--- a/configure
+++ b/configure
@@ -4142,15 +4142,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
     ;;
   arm*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5
-$as_echo_n "checking whether $CC supports Thumb2... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb" >&5
+$as_echo_n "checking whether $CC supports Thumb... " >&6; }
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int ac_test(int i) { return i; }
 int
 main ()
 {
-asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1
+asm(".thumb\nblx ac_test\n.arm"); if (ac_test(1)) return 1
   ;
   return 0;
 }
@@ -4161,7 +4161,7 @@ $as_echo "yes" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-                       as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5
+                       as_fn_error $? "You need a target with Thumb support to build Wine for ARM." "$LINENO" 5
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 1753e14..70e7663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,11 +169,11 @@ case $host in
     fi
     ;;
   arm*)
-    AC_MSG_CHECKING([whether $CC supports Thumb2])
-    WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1],
+    AC_MSG_CHECKING([whether $CC supports Thumb])
+    WINE_TRY_ASM_LINK([".thumb\nblx ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1],
                       [AC_MSG_RESULT([yes])],
                       [AC_MSG_RESULT([no])
-                       AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])])
+                       AC_MSG_ERROR([You need a target with Thumb support to build Wine for ARM.])])
     CFLAGS="$CFLAGS -marm"
     ;;
   *-mingw32*|*-cygwin*)