Date: Sat, 2 Oct 2010 07:28:41 +1000 (EST) From: Bruce Evans <brde@optusnet.com.au> To: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <20101002070552.B942@delplex.bde.org> In-Reply-To: <201010012014.o91KEaYC016578@svn.freebsd.org> References: <201010012014.o91KEaYC016578@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <machine/asm.h>
> -
> -RCSID("$FreeBSD$")
> +__FBSDID("$FreeBSD$")
>
> ENTRY(logbl)
> fldt 8(%rsp)
>
Unlike for similar-at-first-glance includes of <sys/cdefs.h> 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 <machine.asm.h> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101002070552.B942>