diff --git a/target-arm/helper.c b/target-arm/helper.c
index 038025dac02bac5c197f6a4bc92fbab12666826f..40bdeb186e67d15073bd6ada4e3ed61416fcc514 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -602,6 +602,15 @@ void do_interrupt_v7m(CPUARMState *env)
         armv7m_nvic_set_pending(env->v7m.nvic, ARMV7M_EXCP_MEM);
         return;
     case EXCP_BKPT:
+        if (semihosting_enabled) {
+            int nr;
+            nr = lduw_code(env->regs[15]) & 0xff;
+            if (nr == 0xab) {
+                env->regs[15] += 2;
+                env->regs[0] = do_arm_semihosting(env);
+                return;
+            }
+        }
         armv7m_nvic_set_pending(env->v7m.nvic, ARMV7M_EXCP_DEBUG);
         return;
     case EXCP_IRQ:
@@ -687,7 +696,7 @@ void do_interrupt(CPUARMState *env)
         break;
     case EXCP_BKPT:
         /* See if this is a semihosting syscall.  */
-        if (env->thumb) {
+        if (env->thumb && semihosting_enabled) {
             mask = lduw_code(env->regs[15]) & 0xff;
             if (mask == 0xab
                   && (env->uncached_cpsr & CPSR_M) != ARM_CPU_MODE_USR) {