* arm-tdep.c (arm_skip_stack_protector): Accept any symbol that

	starts with __stack_chk_guard as stack guard symbol.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7e1511849ac9d3f97e0109a749e34433dd0225f1..ba2512df146d414fb187696e52f944c9e6a2f818 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-03  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+       * arm-tdep.c (arm_skip_stack_protector): Accept any symbol that
+       starts with __stack_chk_guard as stack guard symbol.
+
 2011-02-03  Andrew Burgess  <aburgess@broadcom.com>
 
        * disasm.c (compare_lines): Handle the end of sequence markers

diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index a9abf2d0a49dfcf47675dd83e19ffa39e9acff31..9dfbf499e8b817fbc94f84d42b9d1690a60c7961 100644 (file)
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1296,7 +1296,8 @@ arm_skip_stack_protector(CORE_ADDR pc, struct gdbarch *gdbarch)
      instruction sequence is not for stack protector.  If symbol is
      removed, we conservatively think this sequence is for stack protector.  */
   if (stack_chk_guard
-      && strcmp (SYMBOL_LINKAGE_NAME(stack_chk_guard), "__stack_chk_guard"))
+      && strncmp (SYMBOL_LINKAGE_NAME (stack_chk_guard), "__stack_chk_guard",
+                 strlen ("__stack_chk_guard")) != 0)
    return pc;
 
   if (is_thumb)