; Update Android port

* src/keyboard.c (handle_input_available_signal): Don't generate
instructions not available in arm mode.

diff --git a/src/keyboard.c b/src/keyboard.c
index eea37fa833fcd3f414281942f4a9b3efbaa17a8c..169756d9f2fcda1245f396e164968844523d2ba5 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7990,11 +7990,11 @@ handle_input_available_signal (int sig)
   /* Make all writes from the Android UI thread visible.  If
      `android_urgent_query' has been set, preceding writes to query
      related variables should become observable here on as well.  */
-#if defined __aarch64__ || defined __arm__
+#if defined __aarch64__
   asm ("dmb ishst");
-#else /* defined __aarch64__ || defined __arm__ */
+#else /* !defined __aarch64__ */
   __atomic_thread_fence (__ATOMIC_SEQ_CST);
-#endif /* !defined __aarch64__ && !defined __arm__ */
+#endif /* defined __aarch64__ */
 #endif /* HAVE_ANDROID && !ANDROID_STUBIFY */
   pending_signals = true;