runtime: Recognize morestack.S if there is no function name.
authorIan Lance Taylor <ian@gcc.gnu.org>
Thu, 31 Jan 2013 23:12:42 +0000 (23:12 +0000)
committerIan Lance Taylor <ian@gcc.gnu.org>
Thu, 31 Jan 2013 23:12:42 +0000 (23:12 +0000)
From-SVN: r195634

libgo/runtime/go-callers.c

index b6c494cb3466b674a951245798fd6832414bd4aa..c20dbf356104eb0c227c786289f2f200c47d6f6b 100644 (file)
@@ -34,13 +34,24 @@ callback (void *data, uintptr_t pc, const char *filename, int lineno,
   /* Skip split stack functions.  */
   if (function != NULL)
     {
-      const char *p = function;
+      const char *p;
 
+      p = function;
       if (__builtin_strncmp (p, "___", 3) == 0)
        ++p;
       if (__builtin_strncmp (p, "__morestack_", 12) == 0)
        return 0;
     }
+  else if (filename != NULL)
+    {
+      const char *p;
+
+      p = strrchr (filename, '/');
+      if (p == NULL)
+       p = filename;
+      if (__builtin_strncmp (p, "morestack.S", 11) == 0)
+       return 0;
+    }
 
   if (arg->skip > 0)
     {