* arm-tdep.c (arm_prologue_this_id): Compare pc, not func, to

	lowest_pc.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9c9e09b38fd0191ad5fcfddd358e0ff9d1b3bef7..d3bdbccff3ee3ec8ec1f5d5efca50bae3441f416 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-02  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * arm-tdep.c (arm_prologue_this_id): Compare pc, not func, to
+       lowest_pc.
+
 2008-05-02  Jim Blandy  <jimb@codesourcery.com>
            Pedro Alves  <pedro@codesourcery.com>
 

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 0380dcd29f87cf3015b80a67b2f7472fb3304062..fa7a3e87d5de5062c9fe9cfeb0774f12dd9c1669 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -981,23 +981,22 @@ arm_prologue_this_id (struct frame_info *this_frame,
 {
   struct arm_prologue_cache *cache;
   struct frame_id id;
-  CORE_ADDR func;
+  CORE_ADDR pc, func;
 
   if (*this_cache == NULL)
     *this_cache = arm_make_prologue_cache (this_frame);
   cache = *this_cache;
 
-  func = get_frame_func (this_frame);
-
-  /* This is meant to halt the backtrace at "_start".  Make sure we
-     don't halt it at a generic dummy frame. */
-  if (func <= gdbarch_tdep (get_frame_arch (this_frame))->lowest_pc)
+  /* This is meant to halt the backtrace at "_start".  */
+  pc = get_frame_pc (this_frame);
+  if (pc <= gdbarch_tdep (get_frame_arch (this_frame))->lowest_pc)
     return;
 
   /* If we've hit a wall, stop.  */
   if (cache->prev_sp == 0)
     return;
 
+  func = get_frame_func (this_frame);
   id = frame_id_build (cache->prev_sp, func);
   *this_id = id;
 }