From owner-svn-src-head@freebsd.org  Tue Jul  3 02:50:08 2018
Return-Path: <owner-svn-src-head@freebsd.org>
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 524B0FF116F;
 Tue,  3 Jul 2018 02:50:08 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 03BC786722;
 Tue,  3 Jul 2018 02:50:08 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D38C61624E;
 Tue,  3 Jul 2018 02:50:07 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w632o7cZ035012;
 Tue, 3 Jul 2018 02:50:07 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w632o7Oa035010;
 Tue, 3 Jul 2018 02:50:07 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201807030250.w632o7Oa035010@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Tue, 3 Jul 2018 02:50:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335880 - in head/sys: conf kern
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: in head/sys: conf kern
X-SVN-Commit-Revision: 335880
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jul 2018 02:50:08 -0000

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
==============================================================================
--- 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
 
 .if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc)
-CLEANFILES+=	assym.inc genassym.o
-DEPENDOBJS+=	genassym.o
+CLEANFILES+=	assym.inc genassym.o genoffset.o
+DEPENDOBJS+=	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}/genassym.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
 .endif
 
 .if defined(KERNBUILDDIR)

Modified: head/sys/kern/genoffset.sh
==============================================================================
--- 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:='nm'} ${NMFLAGS} "$1" | ${AWK:='awk'} '
 	/ C .*_datatype_*/ {
 		type = substr($3, match($3, "_datatype_") + length("_datatype_"))