diff options
Diffstat (limited to 'gdb/infrun.c')
| -rw-r--r-- | gdb/infrun.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gdb/infrun.c b/gdb/infrun.c index 3c64156..7b05504 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2458,7 +2458,7 @@ process_event_stop_test: end of, if we do step into it. */ real_stop_pc = skip_language_trampoline (stop_pc); if (real_stop_pc == 0) - real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + real_stop_pc = gdbarch_skip_trampoline_code (current_gdbarch, stop_pc); if (real_stop_pc != 0) ecs->stop_func_start = real_stop_pc; @@ -2516,10 +2516,12 @@ process_event_stop_test: /* If we're in the return path from a shared library trampoline, we want to proceed through the trampoline when stepping. */ - if (IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name)) + if (gdbarch_in_solib_return_trampoline (current_gdbarch, + stop_pc, ecs->stop_func_name)) { /* Determine where this trampoline returns. */ - CORE_ADDR real_stop_pc = SKIP_TRAMPOLINE_CODE (stop_pc); + CORE_ADDR real_stop_pc = gdbarch_skip_trampoline_code + (current_gdbarch, stop_pc); if (debug_infrun) fprintf_unfiltered (gdb_stdlog, "infrun: stepped into solib return tramp\n"); |