From 8bedbb4d4280397035976593f3b877ad70cbe519 Mon Sep 17 00:00:00 2001
From: Matt Macy <mmacy@FreeBSD.org>
Date: Tue, 3 Jul 2018 02:50:07 +0000
Subject: [PATCH] expose thread_lite definition to tied modules

---
 sys/conf/kmod.mk      | 11 +++++++++--
 sys/kern/genoffset.sh |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index e8aa3ee15201..0a6d92f16488 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -463,9 +463,10 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirk
 .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)
diff --git a/sys/kern/genoffset.sh b/sys/kern/genoffset.sh
index 4318cf85bce9..843c0cbcd862 100644
--- a/sys/kern/genoffset.sh
+++ b/sys/kern/genoffset.sh
@@ -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_"))