Re: CVS commit: src/sys

2020-04-16 Thread Jason Thorpe


> On Apr 16, 2020, at 5:51 PM, Joerg Sonnenberger  wrote:
> 
> 
> That can be fixed generically? .ident needs the SHF_MERGE|SHF_STRINGS as
> section flags and then the linker should do the rest by itself.

Does it matter?  The sooner we get off of "things that use RCS semantics" the 
better.

-- thorpej



Re: CVS commit: src/sys

2020-04-16 Thread Joerg Sonnenberger
On Fri, Apr 17, 2020 at 07:31:51AM +0900, Rin Okuyama wrote:
> On 2020/04/17 6:56, Rin Okuyama wrote:
> > Module Name:src
> > Committed By:   rin
> > Date:   Thu Apr 16 21:56:43 UTC 2020
> > 
> > Modified Files:
> > src/sys/arch/arm/omap: omap3_sdmareg.h omap3_sdmavar.h omapfbreg.h
> > src/sys/arch/arm/ti: omap3_dssreg.h
> > src/sys/arch/macppc/dev: batteryvar.h cudavar.h deqvar.h obiovar.h
> > platinumfbreg.h pmuvar.h valkyriefbreg.h videopllvar.h
> > src/sys/arch/mips/adm5120/dev: if_admswvar.h
> > src/sys/arch/powerpc/include: intr.h
> > src/sys/arch/powerpc/pic: ipivar.h picvar.h
> > src/sys/dev/acpi/wmi: wmi_acpivar.h
> > src/sys/dev/adb: adbvar.h
> > src/sys/dev/i2c: adm1026reg.h dbcool_reg.h dbcool_var.h sgsmixvar.h
> > src/sys/dev/ic: i128reg.h i128var.h
> > src/sys/dev/pci: gffbreg.h ppbvar.h voyagervar.h
> > src/sys/dev/qbus: rlvar.h
> > src/sys/external/bsd/ena-com: ena_plat.h
> > src/sys/lib/libkern: crc16.h
> > src/sys/ufs/ext2fs: ext2fs_xattr.h
> > 
> > Log Message:
> > Stop using __KERNEL_RCSID() in header files; it confuses ident(1) by
> > overwriting RCSID in main source files.
> > 
> > XXX
> > The first argument of __KERNEL_RCSID() is neglected for ELF. If we wish
> > to have RCSID of header files in kernel binary, we need something like
> > __FBSDID() macro in FreeBSD.
> 
> Oops, this description is not correct. __KERNEL_RCSID() in header files
> does *not* overwrite RCSID in main source files. The problem is that it
> inserts its own RCSID in *every* object files.
> 
> As a result, ident(1) shows more than 1000 duplicated lines for GENERIC
> kernel of macppc, for example.

That can be fixed generically? .ident needs the SHF_MERGE|SHF_STRINGS as
section flags and then the linker should do the rest by itself.

Joerg


Re: CVS commit: src/sys

2020-04-16 Thread Rin Okuyama

On 2020/04/17 6:56, Rin Okuyama wrote:

Module Name:src
Committed By:   rin
Date:   Thu Apr 16 21:56:43 UTC 2020

Modified Files:
src/sys/arch/arm/omap: omap3_sdmareg.h omap3_sdmavar.h omapfbreg.h
src/sys/arch/arm/ti: omap3_dssreg.h
src/sys/arch/macppc/dev: batteryvar.h cudavar.h deqvar.h obiovar.h
platinumfbreg.h pmuvar.h valkyriefbreg.h videopllvar.h
src/sys/arch/mips/adm5120/dev: if_admswvar.h
src/sys/arch/powerpc/include: intr.h
src/sys/arch/powerpc/pic: ipivar.h picvar.h
src/sys/dev/acpi/wmi: wmi_acpivar.h
src/sys/dev/adb: adbvar.h
src/sys/dev/i2c: adm1026reg.h dbcool_reg.h dbcool_var.h sgsmixvar.h
src/sys/dev/ic: i128reg.h i128var.h
src/sys/dev/pci: gffbreg.h ppbvar.h voyagervar.h
src/sys/dev/qbus: rlvar.h
src/sys/external/bsd/ena-com: ena_plat.h
src/sys/lib/libkern: crc16.h
src/sys/ufs/ext2fs: ext2fs_xattr.h

Log Message:
Stop using __KERNEL_RCSID() in header files; it confuses ident(1) by
overwriting RCSID in main source files.

XXX
The first argument of __KERNEL_RCSID() is neglected for ELF. If we wish
to have RCSID of header files in kernel binary, we need something like
__FBSDID() macro in FreeBSD.


Oops, this description is not correct. __KERNEL_RCSID() in header files
does *not* overwrite RCSID in main source files. The problem is that it
inserts its own RCSID in *every* object files.

As a result, ident(1) shows more than 1000 duplicated lines for GENERIC
kernel of macppc, for example.

Thanks,
rin