From 9407de8ede3b794226c2601468bb0c967e392245 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Sun, 7 Sep 2003 15:15:01 +0000 Subject: [PATCH] From Nick Kelsey : * infrun.c (handle_inferior_event): Check IN_SOLIB_RETURN_TRAMPOLINE when the stop PC is at the beginning of a function also. --- gdb/ChangeLog | 6 ++++++ gdb/infrun.c | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 418a2a5e01..54b38292f3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-09-07 Daniel Jacobowitz + + From Nick Kelsey : + * infrun.c (handle_inferior_event): Check IN_SOLIB_RETURN_TRAMPOLINE + when the stop PC is at the beginning of a function also. + 2003-09-06 Daniel Jacobowitz * arm-linux-tdep.c (arm_linux_arm_be_breakpoint): New. diff --git a/gdb/infrun.c b/gdb/infrun.c index b2e371eebb..01460efa1f 100644 --- a/gdb/infrun.c +++ b/gdb/infrun.c @@ -2446,9 +2446,9 @@ process_event_stop_test: return; } - if (stop_pc == ecs->stop_func_start /* Quick test */ - || (in_prologue (stop_pc, ecs->stop_func_start) && - !IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name)) + if (((stop_pc == ecs->stop_func_start /* Quick test */ + || in_prologue (stop_pc, ecs->stop_func_start)) + && !IN_SOLIB_RETURN_TRAMPOLINE (stop_pc, ecs->stop_func_name)) || IN_SOLIB_CALL_TRAMPOLINE (stop_pc, ecs->stop_func_name) || ecs->stop_func_name == 0) {