Date: Tue, 3 Jul 2018 11:23:06 -0700 From: Bryan Drewery <bdrewery@FreeBSD.org> To: Matthew Macy <mmacy@freebsd.org> Cc: src-committers <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: <a1be78f5-fcf1-67e0-329b-451f4d657464@FreeBSD.org> In-Reply-To: <CAPrugNqu5sPjTFh3aocK7U_tm3tYiD1zaMmxHn=yreic4LLVMQ@mail.gmail.com> References: <201807030250.w632o7Oa035010@repo.freebsd.org> <a083202a-fca5-c0e9-a292-fdbff487404b@FreeBSD.org> <CAPrugNqu5sPjTFh3aocK7U_tm3tYiD1zaMmxHn=yreic4LLVMQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Dl5ntuEYTRZMCxYqHv0kh9xLYaGrPUpnr Content-Type: multipart/mixed; boundary="QUUvG7jiS2rWm1NegIdQNnMDYhkixX3db"; protected-headers="v1" From: Bryan Drewery <bdrewery@FreeBSD.org> To: Matthew Macy <mmacy@freebsd.org> Cc: src-committers <src-committers@freebsd.org>, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: <a1be78f5-fcf1-67e0-329b-451f4d657464@FreeBSD.org> Subject: Re: svn commit: r335880 - in head/sys: conf kern References: <201807030250.w632o7Oa035010@repo.freebsd.org> <a083202a-fca5-c0e9-a292-fdbff487404b@FreeBSD.org> <CAPrugNqu5sPjTFh3aocK7U_tm3tYiD1zaMmxHn=yreic4LLVMQ@mail.gmail.com> In-Reply-To: <CAPrugNqu5sPjTFh3aocK7U_tm3tYiD1zaMmxHn=yreic4LLVMQ@mail.gmail.com> --QUUvG7jiS2rWm1NegIdQNnMDYhkixX3db Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable On 7/3/2018 11:21 AM, Matthew Macy wrote: > What is the "correct" way to make sure that offset.inc is visible to mo= dules? >=20 Can you answer my question though? Was it a mistake or are you intending there to be a machine-specific genoffset.c? > On Tue, Jul 3, 2018 at 10:39 AM, Bryan Drewery <bdrewery@freebsd.org> w= rote: >> 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 >>> >>> Log: >>> expose thread_lite definition to tied modules >>> >>> Modified: >>> head/sys/conf/kmod.mk >>> head/sys/kern/genoffset.sh >>> >>> 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 (r33587= 9) >>> +++ head/sys/conf/kmod.mk Tue Jul 3 02:50:07 2018 (r33588= 0) >>> @@ -463,9 +463,10 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk= ${SYS >>> .endif >>> >>> .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}/gena= ssym.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 t= he >> global genoffset.c? >> >> And what even generates the machine-specific genoffset.c file? I see n= o >> rule for it anywhere. >> >>> .endif >>> >>> .if defined(KERNBUILDDIR) >>> >>> 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) || defin= ed(KLD_TIED))" >>> ${NM:=3D'nm'} ${NMFLAGS} "$1" | ${AWK:=3D'awk'} ' >>> / C .*_datatype_*/ { >>> type =3D substr($3, match($3, "_datatype_") + length("_= datatype_")) >>> >> >> >> -- >> Regards, >> Bryan Drewery >> --=20 Regards, Bryan Drewery --QUUvG7jiS2rWm1NegIdQNnMDYhkixX3db-- --Dl5ntuEYTRZMCxYqHv0kh9xLYaGrPUpnr 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 iQEcBAEBAgAGBQJbO78KAAoJEDXXcbtuRpfPU+gH+QGQDh3bzfuRc1MOEsKymhOD T3nXjdDT9cVXw6/x2qqxhW612lcuiUkBjYdknPx63KQOk34nOnNK6sxhcwIXb5Uz +mZesEiHQfmVSC9pDpFDoeisXcSCySAs6pFffUF2fQQB3qR644GKoGaYGMh6Tdmy y4MvfHZrRwNfwb8PZr5c609IqJRBlK3oXqr5TLTR+F47Cf+DqoDbMWvn08QcybUZ cREF8DZbmMmHKWNCRAQegtI7fjHyCFgGgZgECn1gS8HqoLnXcquL2bf4GlDHsIuk s4Jru3XabjGOhx3ZaiXom19OAFOvej8/A8OGKbOYk5Zruw6mU3dxB6Zn1OJgJ9k= =KkfP -----END PGP SIGNATURE----- --Dl5ntuEYTRZMCxYqHv0kh9xLYaGrPUpnr--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a1be78f5-fcf1-67e0-329b-451f4d657464>