From owner-svn-src-head@FreeBSD.ORG Mon Apr 1 20:38:11 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id A1EE5C0C; Mon, 1 Apr 2013 20:38:11 +0000 (UTC) (envelope-from jim.harris@gmail.com) Received: from mail-ee0-f47.google.com (mail-ee0-f47.google.com [74.125.83.47]) by mx1.freebsd.org (Postfix) with ESMTP id 8A992F5C; Mon, 1 Apr 2013 20:38:09 +0000 (UTC) Received: by mail-ee0-f47.google.com with SMTP id t10so1182949eei.20 for ; Mon, 01 Apr 2013 13:38:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=i/SvZqxAa1XTojwO7lV3vurVuBIWm1t62O/tAK2vwvo=; b=Wgtx8m8yHECVcuJvGmm/rGewYJqvzWnylLCu5RinsjZvkzAqoFWbpvTAqB4KvDq4Y/ Q2TUaqkKXWdZLXK0tznGAABei1M3V/cfBtll/RrpyS2pDGm4/Au1WffoAkY0K5MMSO1t /yZ/cBzar4PagwdBX1z/52cSYwkPJygyEhd++XrVTUjnb1kFtnKCB90GV03DzQJRoHzO x41zCL2qE1qu/TdeNajgUmOQ60XHixk5DT9rC4NdSyHHCUkJW97AKaAN90bZ7ZFrshqg cYG0tN0cDSyMuwD1w8fKU/+AmTcREncbXPhxCdoVYoUCo19Q7jkPL/rwDwyy2WVNWY/O tjSA== MIME-Version: 1.0 X-Received: by 10.14.207.200 with SMTP id n48mr41741471eeo.4.1364848682822; Mon, 01 Apr 2013 13:38:02 -0700 (PDT) Received: by 10.14.96.129 with HTTP; Mon, 1 Apr 2013 13:38:02 -0700 (PDT) In-Reply-To: <784ED932-664A-4880-8BCA-A7872E947920@FreeBSD.org> References: <201303072243.r27Mhopv039449@svn.freebsd.org> <51592416.7090003@FreeBSD.org> <784ED932-664A-4880-8BCA-A7872E947920@FreeBSD.org> Date: Mon, 1 Apr 2013 13:38:02 -0700 Message-ID: Subject: Re: svn commit: r247962 - head/cddl/contrib/opensolaris/tools/ctf/cvt From: Jim Harris To: Dimitry Andric Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, Andriy Gapon 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Apr 2013 20:38:11 -0000 On Mon, Apr 1, 2013 at 11:04 AM, Dimitry Andric wrote: > On Apr 1, 2013, at 08:07, Andriy Gapon wrote: > > 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. > Do you have a good test case? I tried building a few kernel modules, > but I do see ctf data for functions, at least in ctfdump output. > > Also, a simple test case with a pair of .o files, each containing a > function, seems to work properly when processed with ctfmerge. > > > 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. > > The only other place is cddl/contrib/opensolaris/tools/ctf/cvt/input.c, > so I more or less blindly made the attached diff, which might solve the > problem. Can you please try it in your environment? > > I'm not sure if this is the same problem seen by avg@, but without your patch, I was getting lots of the following when doing "dtrace -lv": fbt_getargdesc(1309): Unknown function! Your patch fixes this issue for me. Thanks, -Jim