cvs commit: src/sys/boot/i386/boot2 boot1.S sio.S src/sys/boot/i386/btx/btx btx.S src/sys/boot/i386/btx/btxldr btxldr.S src/sys/boot/i386/libi386 amd64_tramp.S src/sys/boot/i386/pxeldr pxeldr.S

John Baldwin jhb at FreeBSD.org
Wed Apr 28 11:06:24 PDT 2004


On Wednesday 28 April 2004 11:23 am, Ruslan Ermilov wrote:
> On Wed, Apr 28, 2004 at 11:06:13AM -0400, John Baldwin wrote:
> > On Wednesday 28 April 2004 10:31 am, Ruslan Ermilov wrote:
> > > ru          2004/04/28 07:31:44 PDT
> > >
> > >   FreeBSD src repository
> > >
> > >   Modified files:
> > >     sys/boot/i386/boot2  boot1.S sio.S
> > >     sys/boot/i386/btx/btx btx.S
> > >     sys/boot/i386/btx/btxldr btxldr.S
> > >     sys/boot/i386/libi386 amd64_tramp.S
> > >     sys/boot/i386/pxeldr pxeldr.S
> > >   Log:
> > >   After talking to Bruce Evans and reading more standards specs,
> > >   switch to using C99-style comments everywhere in preprocessed
> > >   assembler.  The reason is that lines starting with the regexp
> > >   '^[[:space:]]#' are treated as preprocessing directives, and
> > >   while it seems to work now with GCC, it's not necessarily has
> > >   to work.  Use C99 comments `//' for the trailing comments to
> > >   save whitespace.
> >
> > Well, that just killed any local diff's anyone had to the boot code for a
> > trivial reason.  as(1) worked just fine, I don't see why it's such a
> > cardinal sin to use as(1) to compile asm files.
>
> The problem is not with as(1) but with cpp(1) -- as explained in
> the commit log our comments weren't strictly speaking comments
> per se, yet you were the one who pointed this out once to me
> when I switched from m4(1) preprocessed .s files to cpp(1)
> preprocessed .S files.

They were perfectly fine as(1) comments. :)  Wanting to use cpp(1) rather than 
--defsym is a style change, but anyways.

> > Thanks for not even asking before hosing the history in cvs annotate:
>
> The history is still here, ``cvs annotate -rX.Y'' still works.

Yes, but cvs walking back through history to see when an actual change was 
originally made takes a bit longer when large scale style changes are made.  
I just think there needs to be a good reason to justify touching every line 
in a file for a non-code change, and --defsym vs. cpp(1) doesn't seem like a 
good reason, but I'm only one voice, so I'll just deal I guess.

> > > grep jhb /usr/src/MAINTAINERS
> >
> > cdboot          jhb     Pre-commit review requested.
> > pxeboot         jhb     Pre-commit review requested.
> > witness         jhb     Pre-commit review requested.
> > sys/boot/i386/cdboot/Makefile:MAINTAINER=       jhb at FreeBSD.org
> > sys/boot/i386/pxeldr/Makefile:MAINTAINER=       jhb at FreeBSD.org
>
> I don't look into makefiles for MAINTAINER bits anymore, and
> you'd better renaming "pxeboot" to "pxeldr" in src/MAINTAINERS.

Those aren't in makefiles.  I think you put them in src/MAINTAINERS when you 
removed them from the Makefiles w/o my permission.

-- 
John Baldwin <jhb at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve"  =  http://www.FreeBSD.org


More information about the cvs-src mailing list