aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2018-03-20 17:58:51 +0000
committerEd Maste <emaste@FreeBSD.org>2018-03-20 17:58:51 +0000
commitfc2a8776a2f9945f22301cd92ec6d3ac1f817028 (patch)
tree78c912ee21149bfb6fe70831431758e2b8777b3c /sys/conf
parent9cffc92c62d9cbf592206ac70cd96ebef816b298 (diff)
downloadsrc-fc2a8776a2f9945f22301cd92ec6d3ac1f817028.tar.gz
src-fc2a8776a2f9945f22301cd92ec6d3ac1f817028.zip
Rename assym.s to assym.inc
assym is only to be included by other .s files, and should never actually be assembled by itself. Reviewed by: imp, bdrewery (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D14180
Notes
Notes: svn path=/head/; revision=331254
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd642
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/conf/kern.post.mk6
-rw-r--r--sys/conf/kmod.mk8
4 files changed, 9 insertions, 9 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 3a57be5323f9..2650d291f373 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -105,7 +105,7 @@ hptrr_lib.o optional hptrr \
#
amd64/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi \
- dependency "$S/amd64/acpica/acpi_wakecode.S assym.s" \
+ dependency "$S/amd64/acpica/acpi_wakecode.S assym.inc" \
compile-with "${NORMAL_S}" \
no-obj no-implicit-rule before-depend \
clean "acpi_wakecode.o"
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index d2b735202702..3fafa40bcef7 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -443,7 +443,7 @@ dev/isci/scil/scif_sas_task_request_states.c optional isci
dev/isci/scil/scif_sas_timer.c optional isci
i386/acpica/acpi_machdep.c optional acpi
acpi_wakecode.o optional acpi \
- dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
+ dependency "$S/i386/acpica/acpi_wakecode.S assym.inc" \
compile-with "${NORMAL_S}" \
no-obj no-implicit-rule before-depend \
clean "acpi_wakecode.o"
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index abce27e92e2f..b4631fee98bc 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -155,7 +155,7 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o
.endif
${SYSTEM_LD_TAIL}
-OBJS_DEPEND_GUESS+= assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} \
+OBJS_DEPEND_GUESS+= assym.inc vnode_if.h ${BEFORE_DEPEND:M*.h} \
${MFILES:T:S/.m$/.h/}
.for mfile in ${MFILES}
@@ -184,7 +184,7 @@ hack.pico: Makefile
${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.pico
rm -f hack.c
-assym.s: $S/kern/genassym.sh genassym.o
+assym.inc: $S/kern/genassym.sh genassym.o
NM='${NM}' NMFLAGS='${NMFLAGS}' sh $S/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: $S/$M/$M/genassym.c
@@ -212,7 +212,7 @@ _SKIP_DEPEND= 1
.endif
kernel-depend: .depend
-SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
+SRCS= assym.inc vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
${MFILES:T:S/.m$/.h/}
DEPENDOBJS+= ${SYSTEM_OBJS} genassym.o
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index c11b7ab4fe72..cd0145510215 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -454,14 +454,14 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirk
${AWK} -f ${SYSDIR}/tools/acpi_quirks2h.awk ${SYSDIR}/dev/acpica/acpi_quirks
.endif
-.if !empty(SRCS:Massym.s) || !empty(DPSRCS:Massym.s)
-CLEANFILES+= assym.s genassym.o
+.if !empty(SRCS:Massym.inc) || !empty(DPSRCS:Massym.inc)
+CLEANFILES+= assym.inc genassym.o
DEPENDOBJS+= genassym.o
-assym.s: genassym.o
+assym.inc: genassym.o
.if defined(KERNBUILDDIR)
genassym.o: opt_global.h
.endif
-assym.s: ${SYSDIR}/kern/genassym.sh
+assym.inc: ${SYSDIR}/kern/genassym.sh
sh ${SYSDIR}/kern/genassym.sh genassym.o > ${.TARGET}
genassym.o: ${SYSDIR}/${MACHINE}/${MACHINE}/genassym.c
genassym.o: ${SRCS:Mopt_*.h}