diff --git a/configure b/configure
index 12783b339b690ad78c1a3ce3f1eb9ba2b5d48a94..ad73d52be1224e4a1d1b41e4fd7ecfaa12e9c62d 100755
--- a/configure
+++ b/configure
@@ -14473,6 +14473,32 @@ $as_echo "$ac_cv_cpp_def___powerpc__" >&6; }
 if test $ac_cv_cpp_def___powerpc__ = yes; then :
   CFLAGS="$CFLAGS -D__powerpc__"
   LINTFLAGS="$LINTFLAGS -D__powerpc__"
+fi ;;
+  *arm*)            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __arm__" >&5
+$as_echo_n "checking whether we need to define __arm__... " >&6; }
+if test "${ac_cv_cpp_def___arm__+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __arm__
+yes
+#endif
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
+  ac_cv_cpp_def___arm__=yes
+else
+  ac_cv_cpp_def___arm__=no
+fi
+rm -f conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpp_def___arm__" >&5
+$as_echo "$ac_cv_cpp_def___arm__" >&6; }
+if test $ac_cv_cpp_def___arm__ = yes; then :
+  CFLAGS="$CFLAGS -D__arm__"
+  LINTFLAGS="$LINTFLAGS -D__arm__"
 fi ;;
 esac
 
diff --git a/configure.ac b/configure.ac
index 2b92883976dae22c2c195426abce1c5da6ad4ae2..c22fcc859e0c03e150861ca544a428686ddf7291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2334,6 +2334,7 @@ case $host_cpu in
   *x86_64*)         WINE_CHECK_DEFINE([__x86_64__]) ;;
   *sparc*)          WINE_CHECK_DEFINE([__sparc__]) ;;
   *powerpc*)        WINE_CHECK_DEFINE([__powerpc__]) ;;
+  *arm*)            WINE_CHECK_DEFINE([__arm__]) ;;
 esac
 
 case $host_vendor in