svn commit: r351892 - in stable/12/sys: conf modules/efirt
Bryan Drewery
bdrewery at FreeBSD.org
Thu Sep 5 20:31:27 UTC 2019
Author: bdrewery
Date: Thu Sep 5 20:31:25 2019
New Revision: 351892
URL: https://svnweb.freebsd.org/changeset/base/351892
Log:
MFC r347458,r348975,r348976:
r347458:
Fix build race with machine links and genoffset.o.
r348975:
Restore genassym.o to CLEANFILES.
r348976:
Add missing DPSRCS entry for assym.inc.
Modified:
stable/12/sys/conf/kern.post.mk
stable/12/sys/conf/kmod.mk
stable/12/sys/modules/efirt/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/conf/kern.post.mk
==============================================================================
--- stable/12/sys/conf/kern.post.mk Thu Sep 5 20:27:44 2019 (r351891)
+++ stable/12/sys/conf/kern.post.mk Thu Sep 5 20:31:25 2019 (r351892)
@@ -329,7 +329,7 @@ _ILINKS+= x86
# Ensure that debug info references the path in the source tree.
.for _link in ${_ILINKS}
.if !exists(${.OBJDIR}/${_link})
-${SRCS} ${CLEAN:M*.o}: ${_link}
+${SRCS} ${DEPENDOBJS}: ${_link}
.endif
.if defined(_MAP_DEBUG_PREFIX)
.if ${_link} == "machine"
Modified: stable/12/sys/conf/kmod.mk
==============================================================================
--- stable/12/sys/conf/kmod.mk Thu Sep 5 20:27:44 2019 (r351891)
+++ stable/12/sys/conf/kmod.mk Thu Sep 5 20:31:25 2019 (r351892)
@@ -476,7 +476,7 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYS
.endif
.if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc)
-CLEANFILES+= assym.inc
+CLEANFILES+= assym.inc genassym.o
DEPENDOBJS+= genassym.o
DPSRCS+= offset.inc
.endif
Modified: stable/12/sys/modules/efirt/Makefile
==============================================================================
--- stable/12/sys/modules/efirt/Makefile Thu Sep 5 20:27:44 2019 (r351891)
+++ stable/12/sys/modules/efirt/Makefile Thu Sep 5 20:31:25 2019 (r351892)
@@ -11,6 +11,7 @@ SRCS+= device_if.h bus_if.h clock_if.h
.if ${MACHINE_CPUARCH} == "amd64"
SRCS+= opt_hwpmc_hooks.h opt_kstack_pages.h
SRCS+= efirt_support.S
+DPSRCS+= assym.inc
efirt_support.o: efirt_support.S assym.inc
${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
${.IMPSRC} -o ${.TARGET}
More information about the svn-src-stable
mailing list