From owner-svn-src-head@FreeBSD.ORG  Thu Mar  7 22:16:36 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 73F0617F;
 Thu,  7 Mar 2013 22:16:36 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 653D07B0;
 Thu,  7 Mar 2013 22:16:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27MGaAf031062;
 Thu, 7 Mar 2013 22:16:36 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27MGZ1b031061;
 Thu, 7 Mar 2013 22:16:35 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201303072216.r27MGZ1b031061@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 7 Mar 2013 22:16:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r247960 - head/cddl/contrib/opensolaris/tools/ctf/cvt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 22:16:36 -0000

Author: dim
Date: Thu Mar  7 22:16:35 2013
New Revision: 247960
URL: http://svnweb.freebsd.org/changeset/base/247960

Log:
  Make ctfconvert work correctly on clang-compiled object files.  Clang
  puts the full original source filename in the STT_FILE entry of the ELF
  symbol table, while gcc saves only the basename.
  
  Since the DWARF DW_AT_name attribute contains the full source filename,
  both for clang and gcc, ctfconvert takes just the basename of it, for
  matching with the STT_FILE entry.  So when attempting to match with such
  an entry, use its basename, if necessary.
  
  Reported by:	avg
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c

Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c
==============================================================================
--- head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Thu Mar  7 22:05:27 2013	(r247959)
+++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Thu Mar  7 22:16:35 2013	(r247960)
@@ -363,6 +363,7 @@ sort_iidescs(Elf *elf, const char *file,
 
 	for (i = 0; i < nent; i++) {
 		GElf_Sym sym;
+		char *bname;
 		iidesc_t **tolist;
 		GElf_Sym ssym;
 		iidesc_match_t smatch;
@@ -377,6 +378,8 @@ sort_iidescs(Elf *elf, const char *file,
 
 		switch (GELF_ST_TYPE(sym.st_info)) {
 		case STT_FILE:
+			bname = strrchr(match.iim_name, '/');
+			bname = bname == NULL ? match.iim_name : bname + 1;
 			match.iim_file = match.iim_name;
 			continue;
 		case STT_OBJECT: