* corefile.c (core_sym_class): Allow for multiple iterations of

	clone clones and subprograms.

2 files changed, 22 insertions, 9 deletions

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index 6b907edbe9..3e9a76ed43 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-07  David Warme  <dwarme@groupw.com>
+
+	* corefile.c (core_sym_class): Allow for multiple iterations of
+	clone clones and subprograms.
+
 2011-04-28  Jonathan Nieder  <jrnieder@gmail.com>
 
 	* cg_print.c (print_header): Add no-c-format comment to prevent
diff --git a/gprof/corefile.c b/gprof/corefile.c
index 2d772f9803..e25d19bb06 100644
--- a/gprof/corefile.c
+++ b/gprof/corefile.c
@@ -387,19 +387,27 @@ core_sym_class (asymbol *sym)
       if (*name == '$')
         return 0;
 
-      if (*name == '.')
+      while (*name == '.')
 	{
-	  /* Allow GCC cloned functions.  */
-	  if (strlen (name) > 7 && strncmp (name, ".clone.", 7) == 0)
-	    name += 6;
+	  /* Allow both nested subprograms (which end with ".NNN", where N is
+	     a digit) and GCC cloned functions (which contain ".clone").
+	     Allow for multiple iterations of both - apparently GCC can clone
+	     clones and subprograms.  */
+	  int digit_seen = 0;
+#define CLONE_NAME      ".clone."
+#define CLONE_NAME_LEN  strlen (CLONE_NAME)
+	      
+	  if (strlen (name) > CLONE_NAME_LEN
+	      && strncmp (name, CLONE_NAME, CLONE_NAME_LEN) == 0)
+	    name += CLONE_NAME_LEN - 1;
 
-	  /* Do not discard nested subprograms (those
-	     which end with .NNN, where N are digits).  */
 	  for (name++; *name; name++)
-	    if (! ISDIGIT (*name))
+	    if (digit_seen && *name == '.')
+	      break;
+	    else if (ISDIGIT (*name))
+	      digit_seen = 1;
+	    else
 	      return 0;
-
-	  break;
 	}
     }