From owner-svn-src-all@FreeBSD.ORG  Fri May 25 06:48:43 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 678A7106566B;
	Fri, 25 May 2012 06:48:43 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 525DB8FC0C;
	Fri, 25 May 2012 06:48:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4P6mhM0086074;
	Fri, 25 May 2012 06:48:43 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4P6mhPP086072;
	Fri, 25 May 2012 06:48:43 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201205250648.q4P6mhPP086072@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Fri, 25 May 2012 06:48:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235975 - head/usr.bin/gprof
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 May 2012 06:48:43 -0000

Author: gber
Date: Fri May 25 06:48:42 2012
New Revision: 235975
URL: http://svn.freebsd.org/changeset/base/235975

Log:
  Fix resolving symbol names on ARM.
  
  On ARM, binutils are adding '$a' symbols in the symbol table for
  every function (in addition to normal symbol). When gprof(1) looks
  up symbol name, it often reads '$a' instead of proper function name,
  because it find it first. With this fix, when read symbol name
  begins with '$' and previous symbol has the same address, it will
  use previous symbol name (which is proper function name).
  
  Obtained from:	Semihalf

Modified:
  head/usr.bin/gprof/lookup.c

Modified: head/usr.bin/gprof/lookup.c
==============================================================================
--- head/usr.bin/gprof/lookup.c	Fri May 25 06:41:08 2012	(r235974)
+++ head/usr.bin/gprof/lookup.c	Fri May 25 06:48:42 2012	(r235975)
@@ -66,6 +66,12 @@ nllookup( address )
 		    printf( "[nllookup] %d (%d) probes\n" , probes , nname-1 );
 		}
 #	    endif /* DEBUG */
+#if defined(__arm__)
+	if (nl[middle].name[0] == '$' &&
+	    nl[middle-1].value == nl[middle].value)
+		middle--;
+#endif
+
 	    return &nl[ middle ];
 	}
 	if ( nl[ middle ].value > address ) {