From cfbafb9a7e8bba1735fae52aeef156439b10fa43 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Thu, 31 Jan 2013 23:12:42 +0000
Subject: runtime: Recognize morestack.S if there is no function name.

From-SVN: r195634
---
 libgo/runtime/go-callers.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'libgo/runtime')

diff --git a/libgo/runtime/go-callers.c b/libgo/runtime/go-callers.c
index b6c494c..c20dbf3 100644
--- a/libgo/runtime/go-callers.c
+++ b/libgo/runtime/go-callers.c
@@ -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)
     {
-- 
cgit v1.1