diff options
| -rw-r--r-- | sys/conf/files.amd64 | 2 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 2 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 11 | ||||
| -rw-r--r-- | sys/modules/linux/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/linux64/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/vmm/Makefile | 6 |
6 files changed, 15 insertions, 10 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index 4401d8c3be4a..f767f08cd075 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -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" diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 5c45dfab4061..a5dabaac2e0d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -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" diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 352b8f1426e0..151b7167ef81 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -463,8 +463,14 @@ 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 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 diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index e49b8da15a99..0a06ec3cba8b 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -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) diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 21ed35c4f06e..fac581b8ea09 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -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) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6cc312b943d2..fa016a97192a 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -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> |