From owner-svn-src-head@freebsd.org Tue Jul 3 17:39:36 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2FEB010356B4; Tue, 3 Jul 2018 17:39:36 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C46358DD97; Tue, 3 Jul 2018 17:39:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (unknown [127.0.1.132]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by freefall.freebsd.org (Postfix) with ESMTPS id 8C971AA6D; Tue, 3 Jul 2018 17:39:35 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mail.xzibition.com (localhost [172.31.3.2]) by mail.xzibition.com (Postfix) with ESMTP id 57543365; Tue, 3 Jul 2018 17:39:34 +0000 (UTC) X-Virus-Scanned: amavisd-new at mail.xzibition.com Received: from mail.xzibition.com ([172.31.3.2]) by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new, port 10026) with LMTP id cnJ9pOHCN-E4; Tue, 3 Jul 2018 17:39:30 +0000 (UTC) Subject: Re: svn commit: r335880 - in head/sys: conf kern DKIM-Filter: OpenDKIM Filter v2.10.3 mail.xzibition.com 097E4360 To: Matt Macy , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201807030250.w632o7Oa035010@repo.freebsd.org> From: Bryan Drewery Openpgp: id=F9173CB2C3AAEA7A5C8A1F0935D771BB6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Autocrypt: addr=bdrewery@FreeBSD.org; prefer-encrypt=mutual; keydata= xsBNBFJphmsBCADiFgmS4bIzwZijrS31SjEMzg+n5zNellgM+HkShwehpqCiyhXdWrvH6dTZ a6u50pbUIX7doTR7W7PQHCjCTqtpwvcj0eulZva+iHFp+XrbgSFHn+VVXgkYP2MFySyZRFab D2qqzJBEJofhpv4HvY6uQI5K99pMqKr1Z/lHqsijYYu4RH2OfwB5PinId7xeldzWEonVoCr+ rfxzO/UrgA6v/3layGZcKNHFjmc3NqoN1DXtdaEHqtjIozzbndVkH6lkFvIpIrI6i5ox8pwp VxsxLCr/4Musd5CWgHiet5kSw2SzNeA8FbxdLYCpXNVu+uBACEbCUP+CSNy3NVfEUxsBABEB AAHNJEJyeWFuIERyZXdlcnkgPGJkcmV3ZXJ5QEZyZWVCU0Qub3JnPsLAgAQTAQoAKgIbAwUL CQgHAwUVCgkICwUWAwIBAAIeAQIXgAIZAQUCWujOIgUJCmB7NwAKCRA113G7bkaXz/xpB/9b /UWIPbieY1IeIuHF2pyYPE7Hytkh3HVsxMA0F5Ma2AYQsXZZeKNKWrF7RPyDyDwUklLHJkhm k3EfClBbHxf08kMIm1vWCJRtgxic9knY/bzYGiWMpHjg3cSd1XfrYH1autYqTZAjDwIkgOjU dR//Tbn4V36sY7y2jz+kdMVWvK53U32aZqiwBbCn4DPe1wSZcUs17mV/0uZdIoGdj74B1orN A/0py5vHYo6HcbBNoaR8pKRLf5VZNRsxqGIMhTucx4SJWcHpuRBWYyvJSFzwvxdK4ZD4Yqoc kFGPVtOXktVMai9exrLvP3G77fKMu8DI6j4QRU4wCesnHuIfRPFuzsBNBFJphmsBCACiVFPf kNfaFtUSuY0395ueo/rMyHPGPQ2iwvERFCpeFGSQSgagpenNHLpFQKTg/dl6FOoST5tqyxMq fyHGHDzzU51bvA/IfaGoNi/BIhTe/toZNMRvpcI3PLjiGcnJnuwCCbAVOAGdb+t5cZtpNdOI cKYmrYG3u9RiBpe6dTF+qLrD/8Bs1wjhduQ8fcNNgnkXu8xDH4ZxY0lIc3QgvYWp9vimlQe6 iKjUd2/DX28ETZcD5h6pYV331KMPTrEI0p0yvFijUZce8c1XHFyL1j9sBAha5qpszJl6Uq5i LolhKRcGfcdmtD72vHQjUYglUyudSJUVyo2gMYjdbiFKzJulABEBAAHCwGUEGAEKAA8CGwwF AlrozigFCQpgez0ACgkQNddxu25Gl8+m5Af/R3VEdxNMAcDIes9ADhQyofj20SPV3eCJ3HYR OebTSuNdOudGt4AAyA8Ks94u9hiIp5IGsc6RDsT9W7O2vgXhd6eV3eiY5Oif5xLIYrIDVu1Y 1GyRxRrPEn/QOqDN6uFZCPwK1aOapGcYCrO9lB0gMuTVfgHanU61rgC9tMX0OoAOyRd+V3/M 8lDNhjJdF/IpO3SdYzKfkwduy4qamw4Gphcx/RfYQvYLq/eDkP8d50PphWdboqWBwNRHayro W/07OGzfxM5fJ5mBsXPQcO2QcRjkyHf6xCM6Hi1qQL4OnXMNE/ZTX0lnOj1/pH93TlzSHZMP TaiiA/MBD3vGsXBmBg== Organization: FreeBSD Message-ID: Date: Tue, 3 Jul 2018 10:39:32 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <201807030250.w632o7Oa035010@repo.freebsd.org> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SguC03ueCBfxYmpKFHyGnL20YPm99urhi" X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Jul 2018 17:39:36 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --SguC03ueCBfxYmpKFHyGnL20YPm99urhi Content-Type: multipart/mixed; boundary="PzCDN6Kk2tgnsfOYX9aQ2VsrO0UDpRSOs"; protected-headers="v1" From: Bryan Drewery To: Matt Macy , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Message-ID: 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--