diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteClientBase.cpp
@@ -152,6 +152,10 @@
       OnRunPacketSent(false);
       break;
     }
+    // If we get here, we were interrupted asynchronously, and told to resume
+    // and continue waiting.  Reset the computed_timeout, since it might have
+    // gotten shortened in waiting for the interrupt.
+    computed_timeout = std::min(interrupt_timeout, kWakeupInterval);
   }
 }