From owner-svn-src-head@FreeBSD.ORG  Mon Apr  1 06:07:24 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 1565E99F;
 Mon,  1 Apr 2013 06:07:24 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
 by mx1.freebsd.org (Postfix) with ESMTP id ACB87DA7;
 Mon,  1 Apr 2013 06:07:22 +0000 (UTC)
Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua
 [212.40.38.100])
 by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id JAA19017;
 Mon, 01 Apr 2013 09:07:20 +0300 (EEST)
 (envelope-from avg@FreeBSD.org)
Received: from localhost ([127.0.0.1])
 by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
 id 1UMXto-00055m-A2; Mon, 01 Apr 2013 09:07:20 +0300
Message-ID: <51592416.7090003@FreeBSD.org>
Date: Mon, 01 Apr 2013 09:07:18 +0300
From: Andriy Gapon <avg@FreeBSD.org>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:17.0) Gecko/20130321 Thunderbird/17.0.4
MIME-Version: 1.0
To: Dimitry Andric <dim@FreeBSD.org>
Subject: Re: svn commit: r247962 - head/cddl/contrib/opensolaris/tools/ctf/cvt
References: <201303072243.r27Mhopv039449@svn.freebsd.org>
In-Reply-To: <201303072243.r27Mhopv039449@svn.freebsd.org>
X-Enigmail-Version: 1.5.1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org,
 src-committers@FreeBSD.org
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: Mon, 01 Apr 2013 06:07:24 -0000

on 08/03/2013 00:43 Dimitry Andric said the following:
> Author: dim
> Date: Thu Mar  7 22:43:50 2013
> New Revision: 247962
> URL: http://svnweb.freebsd.org/changeset/base/247962
> 
> Log:
>   Fix error in r247960: actually assign the basename to match.iim_file.

I've got some bad news.

First of all, sorry for not being thorough enough when this change was
originally proposed.  I rebuilt only ctfconvert with the patch, but ctfmerge was
left alone.

It seems that r247960 + r247962 (this commit) broke ctfmerge in my environment
(head + clang).  While .o files have expected ctf information, combined files
miss ctf data for functions.

I haven't dug yet into this problem, but I suspect that there is some mismatch
at another place (or even multiple places) where STT_FILE is used.


>   Pointed out by:	avg
>   Pointy hat to:	dim
>   MFC after:	1 week
>   X-MFC-With:	r247960
> 
> 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:32:41 2013	(r247961)
> +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c	Thu Mar  7 22:43:50 2013	(r247962)
> @@ -379,8 +379,7 @@ 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;
> +			match.iim_file = bname == NULL ? match.iim_name : bname + 1;
>  			continue;
>  		case STT_OBJECT:
>  			tolist = iiburst->iib_objts;
> 


-- 
Andriy Gapon