From owner-svn-src-head@FreeBSD.ORG Fri Oct 1 21:28:45 2010 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF640106564A; Fri, 1 Oct 2010 21:28:45 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail05.syd.optusnet.com.au (mail05.syd.optusnet.com.au [211.29.132.186]) by mx1.freebsd.org (Postfix) with ESMTP id 75E478FC19; Fri, 1 Oct 2010 21:28:45 +0000 (UTC) Received: from c122-107-116-249.carlnfd1.nsw.optusnet.com.au (c122-107-116-249.carlnfd1.nsw.optusnet.com.au [122.107.116.249]) by mail05.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id o91LSfXr003213 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 2 Oct 2010 07:28:43 +1000 Date: Sat, 2 Oct 2010 07:28:41 +1000 (EST) From: Bruce Evans X-X-Sender: bde@delplex.bde.org To: Dimitry Andric In-Reply-To: <201010012014.o91KEaYC016578@svn.freebsd.org> Message-ID: <20101002070552.B942@delplex.bde.org> References: <201010012014.o91KEaYC016578@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r213337 - in head/lib/msun: amd64 i387 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 01 Oct 2010 21:28:46 -0000 On Fri, 1 Oct 2010, Dimitry Andric wrote: > Log: > Use __FBSDID() instead of RCSID() in most .S files under lib/msun/i386, > and one under lib/msun/amd64. This avoids adding the identifiers to the > .text section, and moves them to the .comment section instead. > > Suggested by: bde > Approved by: rpaulo (mentor) Thanks, but this adds some style bugs... > Modified: head/lib/msun/amd64/s_logbl.S > ============================================================================== > --- head/lib/msun/amd64/s_logbl.S Fri Oct 1 19:02:31 2010 (r213336) > +++ head/lib/msun/amd64/s_logbl.S Fri Oct 1 20:14:36 2010 (r213337) > @@ -34,8 +34,7 @@ > */ > > #include > - > -RCSID("$FreeBSD$") > +__FBSDID("$FreeBSD$") > > ENTRY(logbl) > fldt 8(%rsp) > Unlike for similar-at-first-glance includes of before __FBSDID() in C files, where these includes are unfortunately necessary to get __FBSDID() defined before it is used (without misplacing the latter) and this is indicated by not separating the include line from the __FBSDID() line, the includes of are necessary for the whole file, and this should be indicated by separating the include line from everything else by a blank line like it used to be. Also, 2 files in msun/amd64 still have an uncommented-out RCSID() to indicate where they came from. These should have either a commented-out RCSID() or a non-broken RCSID() using .ident. We mostly use the former. Also, all except 11 files in msun/i387 and 1 file in msun/amd64 are missing a commented-out RCSID("$NetBSD...$") to indicated where they came from. I think most of the NetBSD ids were corrupted in the initial import when the id string was spelled $Id$ so it was not unique, so that even id strings in comments (and not surrounded by FOOID()) got corrupted. Full fixes in this area involve determining the original vendor ids and adding them to most of the files as comments. I think no one cares about who wrote the old bits, but sometimes I would like to track the history of the file. Don't forget to add "from:" lines for repo-copies and other times when the file name or directory changed, or if version control history was lost, so that the history can be found. Bruce