Author: bdrewery
Date: Tue Jul 3 21:02:25 2018
New Revision: 335910
URL: https://svnweb.freebsd.org/changeset/base/335910
Log:
All genassym.sh usage need offset.inc
Modified:
head/sys/conf/files.amd64
head/sys/conf/files.i386
head/sys/conf/kmod.mk
head/sys/modules/linux/Makefile
head/sys/modules/linux64/Makefile
head/sys/modules/vmm/Makefile
Modified: head/sys/conf/files.amd64
==============================================================================
--- head/sys/conf/files.amd64 Tue Jul 3 21:02:21 2018 (r335909)
+++ head/sys/conf/files.amd64 Tue Jul 3 21:02:25 2018 (r335910)
@@ -33,7 +33,7 @@ cloudabi64_vdso_blob.o optional
compat_cloudabi64 \
clean "cloudabi64_vdso_blob.o"
#
linux32_genassym.o optional compat_linux32 \
- dependency "$S/amd64/linux32/linux32_genassym.c" \
+ dependency "$S/amd64/linux32/linux32_genassym.c offset.inc"
\
compile-with "${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \
no-obj no-implicit-rule \
clean "linux32_genassym.o"
Modified: head/sys/conf/files.i386
==============================================================================
--- head/sys/conf/files.i386 Tue Jul 3 21:02:21 2018 (r335909)
+++ head/sys/conf/files.i386 Tue Jul 3 21:02:25 2018 (r335910)
@@ -20,7 +20,7 @@ cloudabi32_vdso_blob.o optional
compat_cloudabi32 \
clean "cloudabi32_vdso_blob.o"
#
linux_genassym.o optional compat_linux \
- dependency "$S/i386/linux/linux_genassym.c" \
+ dependency "$S/i386/linux/linux_genassym.c offset.inc"
\
compile-with "${CC} ${CFLAGS:N-flto:N-fno-common} -c ${.IMPSRC}" \
no-obj no-implicit-rule \
clean "linux_genassym.o"
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Tue Jul 3 21:02:21 2018 (r335909)
+++ head/sys/conf/kmod.mk Tue Jul 3 21:02:25 2018 (r335910)
@@ -463,8 +463,14 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYS
.endif
.if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc)
-CLEANFILES+= assym.inc genassym.o genoffset.o
-DEPENDOBJS+= genassym.o genoffset.o
+CLEANFILES+= assym.inc
+DEPENDOBJS+= genassym.o
+DPSRCS+= offset.inc
+.endif
+.if !empty(SRCS:Moffset.inc) || !empty(DPSRCS:Moffset.inc)
+CLEANFILES+= offset.inc genoffset.o
+DEPENDOBJS+= genoffset.o
+.endif
assym.inc: genassym.o
offset.inc: genoffset.o
.if defined(KERNBUILDDIR)
@@ -482,7 +488,6 @@ genoffset.o: ${SYSDIR}/kern/genoffset.c
genoffset.o: ${SRCS:Mopt_*.h}
${CC} -c ${CFLAGS:N-flto:N-fno-common} \
${SYSDIR}/kern/genoffset.c
-.endif
.if defined(KERNBUILDDIR)
${OBJS}: opt_global.h
Modified: head/sys/modules/linux/Makefile
==============================================================================
--- head/sys/modules/linux/Makefile Tue Jul 3 21:02:21 2018
(r335909)
+++ head/sys/modules/linux/Makefile Tue Jul 3 21:02:25 2018
(r335910)
@@ -76,7 +76,7 @@ ${VDSO}.so: linux${SFX}_locore.o
strip -N _binary_linux_locore_o_size ${.TARGET}
.endif
-linux${SFX}_genassym.o:
+linux${SFX}_genassym.o: offset.inc
${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
.if !defined(KERNBUILDDIR)
Modified: head/sys/modules/linux64/Makefile
==============================================================================
--- head/sys/modules/linux64/Makefile Tue Jul 3 21:02:21 2018
(r335909)
+++ head/sys/modules/linux64/Makefile Tue Jul 3 21:02:25 2018
(r335910)
@@ -51,7 +51,7 @@ linux_support.o: assym.inc linux_assym.h
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
${.IMPSRC} -o ${.TARGET}
-linux_genassym.o:
+linux_genassym.o: offset.inc
${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
.if !defined(KERNBUILDDIR)
Modified: head/sys/modules/vmm/Makefile
==============================================================================
--- head/sys/modules/vmm/Makefile Tue Jul 3 21:02:21 2018
(r335909)
+++ head/sys/modules/vmm/Makefile Tue Jul 3 21:02:25 2018
(r335910)
@@ -4,7 +4,7 @@ KMOD= vmm
SRCS= opt_acpi.h opt_ddb.h device_if.h bus_if.h pci_if.h pcib_if.h acpi_if.h
DPSRCS+= vmx_assym.h svm_assym.h
-DPSRCS+= vmx_genassym.c svm_genassym.c
+DPSRCS+= vmx_genassym.c svm_genassym.c offset.inc
CFLAGS+= -DVMM_KEEP_STATS -DSMP
CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
@@ -74,10 +74,10 @@ svm_support.o:
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
${.IMPSRC} -o ${.TARGET}
-vmx_genassym.o:
+vmx_genassym.o: offset.inc
${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
-svm_genassym.o:
+svm_genassym.o: offset.inc
${CC} -c ${CFLAGS:N-flto:N-fno-common} ${.IMPSRC}
.include <bsd.kmod.mk>
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
