diff options
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/infrun.c | 3 | ||||
| -rw-r--r-- | gdb/linux-tdep.c | 3 |
3 files changed, 12 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb95a89..3e72420 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2016-03-15 Pedro Alves <palves@redhat.com> + + PR gdb/19676 + * infrun.c (displaced_step_prepare): Also disable displaced + stepping on NOT_SUPPORTED_ERROR. + * linux-tdep.c (linux_displaced_step_location): If reading auxv + fails, throw NOT_SUPPORTED_ERROR instead of generic error. + 2016-03-13 Marcin Kościelnicki <koriakin@0x04.net> * s390-linux-tdep.c (s390_gen_return_address): New function. diff --git a/gdb/infrun.c b/gdb/infrun.c index 3e8c9e0..696105d 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -1894,7 +1894,8 @@ displaced_step_prepare (ptid_t ptid) { struct displaced_step_inferior_state *displaced_state; - if (ex.error != MEMORY_ERROR) + if (ex.error != MEMORY_ERROR + && ex.error != NOT_SUPPORTED_ERROR) throw_exception (ex); if (debug_infrun) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index 555c302..f197aa7 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -2426,7 +2426,8 @@ linux_displaced_step_location (struct gdbarch *gdbarch) location. The auxiliary vector gets us the PowerPC-side entry point address instead. */ if (target_auxv_search (¤t_target, AT_ENTRY, &addr) <= 0) - error (_("Cannot find AT_ENTRY auxiliary vector entry.")); + throw_error (NOT_SUPPORTED_ERROR, + _("Cannot find AT_ENTRY auxiliary vector entry.")); /* Make certain that the address points at real code, and not a function descriptor. */ |