diff options
Diffstat (limited to 'gdb/m32r-stub.c')
| -rw-r--r-- | gdb/m32r-stub.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/gdb/m32r-stub.c b/gdb/m32r-stub.c index a691a657a23..2e69b4403ea 100644 --- a/gdb/m32r-stub.c +++ b/gdb/m32r-stub.c @@ -210,8 +210,16 @@ handle_exception(int exceptionVector) unsigned char buf[16]; int binary; - if (!finish_from_step()) - return; /* "false step": let the target continue */ + /* Do not call finish_from_step() if this is not a trap #1 + * (breakpoint trap). Without this check, the finish_from_step() + * might interpret a system call trap as a single step trap. This + * can happen if: the stub receives 's' and exits, but an interrupt + * was pending; the interrupt is now handled and causes the stub to + * be reentered because some function makes a system call. + */ + if (exceptionVector == 1) /* Trap exception? */ + if (!finish_from_step()) /* Go see if stepping state needs update. */ + return; /* "false step": let the target continue */ gdb_m32r_vector = exceptionVector; |