Date: Tue, 3 Jul 2018 10:39:32 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Matt Macy <mmacy@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r335880 - in head/sys: conf kern Message-ID: <a083202a-fca5-c0e9-a292-fdbff487404b@FreeBSD.org> In-Reply-To: <201807030250.w632o7Oa035010@repo.freebsd.org> References: <201807030250.w632o7Oa035010@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --SguC03ueCBfxYmpKFHyGnL20YPm99urhi Content-Type: multipart/mixed; boundary="PzCDN6Kk2tgnsfOYX9aQ2VsrO0UDpRSOs"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Matt Macy <mmacy@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <a083202a-fca5-c0e9-a292-fdbff487404b@FreeBSD.org> Subject: Re: svn commit: r335880 - in head/sys: conf kern References: <201807030250.w632o7Oa035010@repo.freebsd.org> In-Reply-To: <201807030250.w632o7Oa035010@repo.freebsd.org> --PzCDN6Kk2tgnsfOYX9aQ2VsrO0UDpRSOs Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 7/2/2018 7:50 PM, Matt Macy wrote: > Author: mmacy > Date: Tue Jul 3 02:50:07 2018 > New Revision: 335880 > URL: https://svnweb.freebsd.org/changeset/base/335880 >=20 > Log: > expose thread_lite definition to tied modules >=20 > Modified: > head/sys/conf/kmod.mk > head/sys/kern/genoffset.sh >=20 > Modified: head/sys/conf/kmod.mk > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/conf/kmod.mk Tue Jul 3 01:55:09 2018 (r335879) > +++ head/sys/conf/kmod.mk Tue Jul 3 02:50:07 2018 (r335880) > @@ -463,9 +463,10 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk $= {SYS > .endif > =20 > .if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc) > -CLEANFILES+=3D assym.inc genassym.o > -DEPENDOBJS+=3D genassym.o > +CLEANFILES+=3D assym.inc genassym.o genoffset.o > +DEPENDOBJS+=3D genassym.o genoffset.o > assym.inc: genassym.o > +offset.inc: genoffset.o > .if defined(KERNBUILDDIR) > genassym.o: opt_global.h > .endif > @@ -475,6 +476,12 @@ genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genass= ym.c > genassym.o: ${SRCS:Mopt_*.h} > ${CC} -c ${CFLAGS:N-flto:N-fno-common} \ > ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c > +offset.inc: ${SYSDIR}/kern/genoffset.sh genoffset.o > + sh ${SYSDIR}/kern/genoffset.sh genoffset.o > ${.TARGET} > +genoffset.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genoffset.c > +genoffset.o: ${SRCS:Mopt_*.h} > + ${CC} -c ${CFLAGS:N-flto:N-fno-common} \ > + ${SYSDIR}/${MACHINE}/${MACHINE}/genoffset.c Why is this using machine-specific genoffset.c but kern.post.mk uses the global genoffset.c? And what even generates the machine-specific genoffset.c file? I see no rule for it anywhere. > .endif > =20 > .if defined(KERNBUILDDIR) >=20 > Modified: head/sys/kern/genoffset.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/genoffset.sh Tue Jul 3 01:55:09 2018 (r335879) > +++ head/sys/kern/genoffset.sh Tue Jul 3 02:50:07 2018 (r335880) > @@ -39,7 +39,7 @@ work() > { > echo "#ifndef _OFFSET_INC_" > echo "#define _OFFSET_INC_" > - echo "#if !defined(GENOFFSET) && !defined(KLD_MODULE)" > + echo "#if !defined(GENOFFSET) && (!defined(KLD_MODULE) || defined(KLD= _TIED))" > ${NM:=3D'nm'} ${NMFLAGS} "$1" | ${AWK:=3D'awk'} ' > / C .*_datatype_*/ { > type =3D substr($3, match($3, "_datatype_") + length("_datatype_")) >=20 --=20 Regards, Bryan Drewery --PzCDN6Kk2tgnsfOYX9aQ2VsrO0UDpRSOs-- --SguC03ueCBfxYmpKFHyGnL20YPm99urhi Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJbO7TUAAoJEDXXcbtuRpfPqIAH/idYSW2ZdZZMJt6ZdPvGfgyh AG/lNYVte2VF1H9LJi2ryKosfWoBMtZLfzE9GMfZ3G4qap72TYv9cnaHmshYGh8k gGXX/wVAswikDlPlwdkSB8Yq/elS87ak7qm7/sWLcCUZQ2O7/rYAf7YpaIexPqXz QIrQhuXpqRnO3oNSRVNLY7/tPwoGDEYqGMiuvyEhv7GV1xBeIj2QDXaTJasI6XLx 1uHRcUuWM7h4nOYVP4P02SO2/l5Nj8V1wyaOkOgC/u6VnF0ZXWF1HZTZWf+sFXTI mupmw0KEsG6bNLlEQzKQBGi6ECYi2CN9HRRKCWATuxGfp1hLOMPt/ax0tanKDDU= =v0/J -----END PGP SIGNATURE----- --SguC03ueCBfxYmpKFHyGnL20YPm99urhi--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a083202a-fca5-c0e9-a292-fdbff487404b>