diff --git a/sys/amd64/acpica/acpi_wakecode.S b/sys/amd64/acpica/acpi_wakecode.S index a63b5b8b7692..5c7a92ecd264 100644 --- a/sys/amd64/acpica/acpi_wakecode.S +++ b/sys/amd64/acpica/acpi_wakecode.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Resume entry point for real mode. diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 8714b59ae233..114d52e5a8f2 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -44,7 +44,7 @@ #include "opt_smp.h" -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/amd64/amd64/atpic_vector.S b/sys/amd64/amd64/atpic_vector.S index 72ddd9b68312..d82ffd30e1c9 100644 --- a/sys/amd64/amd64/atpic_vector.S +++ b/sys/amd64/amd64/atpic_vector.S @@ -36,7 +36,7 @@ * master and slave interrupt controllers. */ -#include "assym.s" +#include "assym.inc" #include /* diff --git a/sys/amd64/amd64/cpu_switch.S b/sys/amd64/amd64/cpu_switch.S index 25e3a5921711..fe38f48fa038 100644 --- a/sys/amd64/amd64/cpu_switch.S +++ b/sys/amd64/amd64/cpu_switch.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" /*****************************************************************************/ diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index d1872d17956c..01de24c3a368 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -42,7 +42,7 @@ #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 4acef978cba9..d070c10693b7 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -31,7 +31,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Compiled KERNBASE location diff --git a/sys/amd64/amd64/mpboot.S b/sys/amd64/amd64/mpboot.S index 0608b3e31ee2..8af5a7898c9a 100644 --- a/sys/amd64/amd64/mpboot.S +++ b/sys/amd64/amd64/mpboot.S @@ -29,7 +29,7 @@ #include /* miscellaneous asm macros */ #include -#include "assym.s" +#include "assym.inc" .data /* So we can modify it */ diff --git a/sys/amd64/amd64/sigtramp.S b/sys/amd64/amd64/sigtramp.S index a05ea8587b56..a249a1a646f2 100644 --- a/sys/amd64/amd64/sigtramp.S +++ b/sys/amd64/amd64/sigtramp.S @@ -30,7 +30,7 @@ #include -#include "assym.s" +#include "assym.inc" .text /********************************************************************** diff --git a/sys/amd64/amd64/support.S b/sys/amd64/amd64/support.S index 20b715fde438..908ea635b001 100644 --- a/sys/amd64/amd64/support.S +++ b/sys/amd64/amd64/support.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S index 43eb1f1fdb95..06349fd90610 100644 --- a/sys/amd64/amd64/xen-locore.S +++ b/sys/amd64/amd64/xen-locore.S @@ -40,7 +40,7 @@ #define __ASSEMBLY__ #include -#include "assym.s" +#include "assym.inc" .section __xen_guest ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz, "FreeBSD") diff --git a/sys/amd64/ia32/ia32_exception.S b/sys/amd64/ia32/ia32_exception.S index 1f09764275f7..a52df956f869 100644 --- a/sys/amd64/ia32/ia32_exception.S +++ b/sys/amd64/ia32/ia32_exception.S @@ -28,7 +28,7 @@ #include -#include "assym.s" +#include "assym.inc" .text /* diff --git a/sys/amd64/linux/linux_support.s b/sys/amd64/linux/linux_support.s index f468cc84c6b0..5122ab2ae0c5 100644 --- a/sys/amd64/linux/linux_support.s +++ b/sys/amd64/linux/linux_support.s @@ -31,7 +31,7 @@ #include "linux_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault: movq $0,PCB_ONFAULT(%r8) diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.s index c711ac2ddd9e..2b2d6c2cc914 100644 --- a/sys/amd64/linux32/linux32_support.s +++ b/sys/amd64/linux32/linux32_support.s @@ -31,7 +31,7 @@ #include "linux32_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault: movq $0,PCB_ONFAULT(%r8) diff --git a/sys/amd64/sgx/sgx_support.S b/sys/amd64/sgx/sgx_support.S index d9368d3fe439..16b1263ea3f5 100644 --- a/sys/amd64/sgx/sgx_support.S +++ b/sys/amd64/sgx/sgx_support.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text diff --git a/sys/arm/arm/bcopy_page.S b/sys/arm/arm/bcopy_page.S index 0d787b2c427d..da2edf4a0a6e 100644 --- a/sys/arm/arm/bcopy_page.S +++ b/sys/arm/arm/bcopy_page.S @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" #ifndef _ARM_ARCH_5E diff --git a/sys/arm/arm/bcopyinout.S b/sys/arm/arm/bcopyinout.S index 0a2e83586403..949ea090331b 100644 --- a/sys/arm/arm/bcopyinout.S +++ b/sys/arm/arm/bcopyinout.S @@ -36,7 +36,7 @@ */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/arm/arm/copystr.S b/sys/arm/arm/copystr.S index 130e6ef9134f..8a218b4f7bf9 100644 --- a/sys/arm/arm/copystr.S +++ b/sys/arm/arm/copystr.S @@ -38,7 +38,7 @@ * Created : 16/05/95 */ -#include "assym.s" +#include "assym.inc" #include #include __FBSDID("$FreeBSD$"); diff --git a/sys/arm/arm/cpu_asm-v6.S b/sys/arm/arm/cpu_asm-v6.S index ea15e176d69e..c62a7e7ca26f 100644 --- a/sys/arm/arm/cpu_asm-v6.S +++ b/sys/arm/arm/cpu_asm-v6.S @@ -26,7 +26,7 @@ * * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index e7c9e052bff1..52a7021f2859 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -46,7 +46,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/arm/arm/fusu.S b/sys/arm/arm/fusu.S index 79e7ca13fea7..91c6d9ed2f60 100644 --- a/sys/arm/arm/fusu.S +++ b/sys/arm/arm/fusu.S @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" __FBSDID("$FreeBSD$"); .syntax unified diff --git a/sys/arm/arm/hypervisor-stub.S b/sys/arm/arm/hypervisor-stub.S index 9fc94c79435b..e7268e6465c4 100644 --- a/sys/arm/arm/hypervisor-stub.S +++ b/sys/arm/arm/hypervisor-stub.S @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include #include #include diff --git a/sys/arm/arm/in_cksum_arm.S b/sys/arm/arm/in_cksum_arm.S index 5f121d5614b9..0efe508dcb78 100644 --- a/sys/arm/arm/in_cksum_arm.S +++ b/sys/arm/arm/in_cksum_arm.S @@ -43,7 +43,7 @@ #include "opt_inet.h" #include -#include "assym.s" +#include "assym.inc" __FBSDID("$FreeBSD$"); .syntax unified diff --git a/sys/arm/arm/locore-v4.S b/sys/arm/arm/locore-v4.S index 2c14b0f92833..572c6c3a04ef 100644 --- a/sys/arm/arm/locore-v4.S +++ b/sys/arm/arm/locore-v4.S @@ -33,7 +33,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include #include diff --git a/sys/arm/arm/locore-v6.S b/sys/arm/arm/locore-v6.S index 04858426ba34..94737f1c5ccb 100644 --- a/sys/arm/arm/locore-v6.S +++ b/sys/arm/arm/locore-v6.S @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include #include #include @@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$"); -/* We map 64MB of kernel unless overridden in assym.s by the kernel option. */ +/* We map 64MB of kernel unless overridden in assym.inc by the kernel option. */ #ifndef LOCORE_MAP_MB #define LOCORE_MAP_MB 64 #endif diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S index e26ac8214ff4..8f1191f03098 100644 --- a/sys/arm/arm/support.S +++ b/sys/arm/arm/support.S @@ -89,7 +89,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .syntax unified diff --git a/sys/arm/arm/swtch-v4.S b/sys/arm/arm/swtch-v4.S index 4576ef46a69e..17c8f8009664 100644 --- a/sys/arm/arm/swtch-v4.S +++ b/sys/arm/arm/swtch-v4.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include diff --git a/sys/arm/arm/swtch-v6.S b/sys/arm/arm/swtch-v6.S index 9a97a789bca9..8bbd88bc8670 100644 --- a/sys/arm/arm/swtch-v6.S +++ b/sys/arm/arm/swtch-v6.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include diff --git a/sys/arm/arm/swtch.S b/sys/arm/arm/swtch.S index e70532a447e2..b1180b06fc07 100644 --- a/sys/arm/arm/swtch.S +++ b/sys/arm/arm/swtch.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/arm64/arm64/bzero.S b/sys/arm64/arm64/bzero.S index 60ac97e87b23..6c7f1fef1494 100644 --- a/sys/arm64/arm64/bzero.S +++ b/sys/arm64/arm64/bzero.S @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" /* * void bzero(void *p, size_t size) diff --git a/sys/arm64/arm64/copyinout.S b/sys/arm64/arm64/copyinout.S index 64e0a4bbd43a..5c523d11ed00 100644 --- a/sys/arm64/arm64/copyinout.S +++ b/sys/arm64/arm64/copyinout.S @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include -#include "assym.s" +#include "assym.inc" /* * Fault handler for the copy{in,out} functions below. diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index e025236fb473..9cb907169acb 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -29,7 +29,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .text diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index 09d844442da1..76b57403f27c 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include #include diff --git a/sys/arm64/arm64/support.S b/sys/arm64/arm64/support.S index ddbf1b2cd170..7007978f2374 100644 --- a/sys/arm64/arm64/support.S +++ b/sys/arm64/arm64/support.S @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" /* * One of the fu* or su* functions failed, return -1. diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index 779af785f2ab..c9843303b1d3 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -29,7 +29,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include "opt_sched.h" diff --git a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S index a0ed8a7f3abf..710232a0d428 100644 --- a/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S index 09eea5606e4c..a1e9b9c66521 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define INTR_POP \ MEXITCOUNT; \ diff --git a/sys/cddl/dev/dtrace/arm/dtrace_asm.S b/sys/cddl/dev/dtrace/arm/dtrace_asm.S index d7b3ead7197f..1b9996bb133a 100644 --- a/sys/cddl/dev/dtrace/arm/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/arm/dtrace_asm.S @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) diff --git a/sys/cddl/dev/dtrace/i386/dtrace_asm.S b/sys/cddl/dev/dtrace/i386/dtrace_asm.S index 5dac5ef4b8c7..116db1f84be1 100644 --- a/sys/cddl/dev/dtrace/i386/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/i386/dtrace_asm.S @@ -32,7 +32,7 @@ #include #include -#include "assym.s" +#include "assym.inc" ENTRY(dtrace_invop_start) diff --git a/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S b/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S index e5de4f7f545e..d4074ddd5844 100644 --- a/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S @@ -28,7 +28,7 @@ * Use is subject to license terms. */ -#include "assym.s" +#include "assym.inc" #define _ASM diff --git a/sys/cddl/dev/dtrace/riscv/dtrace_asm.S b/sys/cddl/dev/dtrace/riscv/dtrace_asm.S index a2e4b5283d93..eeaf64061675 100644 --- a/sys/cddl/dev/dtrace/riscv/dtrace_asm.S +++ b/sys/cddl/dev/dtrace/riscv/dtrace_asm.S @@ -37,7 +37,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) 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} diff --git a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S index 6e396f317a87..21f2f3c5cad7 100644 --- a/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S +++ b/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/dev/hyperv/vmbus/i386/vmbus_vector.S b/sys/dev/hyperv/vmbus/i386/vmbus_vector.S index 9e28ef6528a5..a7152d80ee22 100644 --- a/sys/dev/hyperv/vmbus/i386/vmbus_vector.S +++ b/sys/dev/hyperv/vmbus/i386/vmbus_vector.S @@ -29,7 +29,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * This is the Hyper-V vmbus channel direct callback interrupt. diff --git a/sys/i386/acpica/acpi_wakecode.S b/sys/i386/acpica/acpi_wakecode.S index 9c91c208efcd..04799d5f5a06 100644 --- a/sys/i386/acpica/acpi_wakecode.S +++ b/sys/i386/acpica/acpi_wakecode.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Resume entry point. The BIOS enters here in real mode after POST with diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.s index 3cf2f307eabc..3627f4a06a1e 100644 --- a/sys/i386/i386/apic_vector.s +++ b/sys/i386/i386/apic_vector.s @@ -42,7 +42,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text SUPERALIGN_TEXT diff --git a/sys/i386/i386/atpic_vector.s b/sys/i386/i386/atpic_vector.s index ebbd505ed4fc..29adbad243cd 100644 --- a/sys/i386/i386/atpic_vector.s +++ b/sys/i386/i386/atpic_vector.s @@ -38,7 +38,7 @@ #include -#include "assym.s" +#include "assym.inc" /* * Macros for interrupt entry, call to handler, and exit. diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.s index 3af198adb5e9..c40b9ea4e029 100644 --- a/sys/i386/i386/bioscall.s +++ b/sys/i386/i386/bioscall.s @@ -32,7 +32,7 @@ #include -#include "assym.s" +#include "assym.inc" .data ALIGN_DATA diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.s index 36ac5796c085..e9bab229bdcc 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.s @@ -42,7 +42,7 @@ #include #include -#include "assym.s" +#include "assym.inc #define SEL_RPL_MASK 0x0003 #define GSEL_KPL 0x0020 /* GSEL(GCODE_SEL, SEL_KPL) */ diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s index 8685e1a9c7e5..5d2add7a12cf 100644 --- a/sys/i386/i386/locore.s +++ b/sys/i386/i386/locore.s @@ -52,7 +52,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * XXX diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s index cdbd28363708..1130284034f1 100644 --- a/sys/i386/i386/mpboot.s +++ b/sys/i386/i386/mpboot.s @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define R(x) ((x)-KERNBASE) diff --git a/sys/i386/i386/sigtramp.s b/sys/i386/i386/sigtramp.s index 61a3c2ad6f29..d0c142761294 100644 --- a/sys/i386/i386/sigtramp.s +++ b/sys/i386/i386/sigtramp.s @@ -45,7 +45,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Signal trampoline, copied to top of user stack diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.s index c44f37427bc4..0ce4107caac0 100644 --- a/sys/i386/i386/support.s +++ b/sys/i386/i386/support.s @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define IDXSHIFT 10 diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.s index 4562c7ed87f4..ed0fab9dbbad 100644 --- a/sys/i386/i386/swtch.s +++ b/sys/i386/i386/swtch.s @@ -36,7 +36,7 @@ #include -#include "assym.s" +#include "assym.inc" #if defined(SMP) && defined(SCHED_ULE) #define SETOP xchgl diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s index 98c6f3da15dc..c71fc4a31d72 100644 --- a/sys/i386/i386/vm86bios.s +++ b/sys/i386/i386/vm86bios.s @@ -29,7 +29,7 @@ #include /* miscellaneous asm macros */ #include -#include "assym.s" +#include "assym.inc" #define SCR_NEWPTD PCB_ESI /* readability macros */ #define SCR_VMFRAME PCB_EBP /* see vm86.c for explanation */ diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.s index 34d0434704e9..8c2499af872e 100644 --- a/sys/i386/linux/linux_locore.s +++ b/sys/i386/linux/linux_locore.s @@ -5,7 +5,7 @@ #include /* system call numbers */ -#include "assym.s" +#include "assym.inc" /* * To avoid excess stack frame the signal trampoline code emulates diff --git a/sys/i386/linux/linux_support.s b/sys/i386/linux/linux_support.s index e3a60e0be4f7..fe49dd9effdd 100644 --- a/sys/i386/linux/linux_support.s +++ b/sys/i386/linux/linux_support.s @@ -31,7 +31,7 @@ #include "linux_assym.h" /* system definitions */ #include /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault_decx: movl PCPU(CURPCB),%ecx diff --git a/sys/mips/cavium/octeon_cop2.S b/sys/mips/cavium/octeon_cop2.S index 0a983f986634..fd0f93900a3b 100644 --- a/sys/mips/cavium/octeon_cop2.S +++ b/sys/mips/cavium/octeon_cop2.S @@ -29,7 +29,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder diff --git a/sys/mips/ingenic/jz4780_mpboot.S b/sys/mips/ingenic/jz4780_mpboot.S index 5481c5eb0797..acd9658d8ccc 100644 --- a/sys/mips/ingenic/jz4780_mpboot.S +++ b/sys/mips/ingenic/jz4780_mpboot.S @@ -27,7 +27,7 @@ */ #include -#include "assym.s" +#include "assym.inc" .text .set noat diff --git a/sys/mips/mips/exception.S b/sys/mips/mips/exception.S index 865abf970ed5..892bebc8f37f 100644 --- a/sys/mips/mips/exception.S +++ b/sys/mips/mips/exception.S @@ -63,7 +63,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! diff --git a/sys/mips/mips/fp.S b/sys/mips/mips/fp.S index cb7b4a7e6ef5..b959f86fc631 100644 --- a/sys/mips/mips/fp.S +++ b/sys/mips/mips/fp.S @@ -43,7 +43,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define SEXP_INF 0xff #define DEXP_INF 0x7ff diff --git a/sys/mips/mips/locore.S b/sys/mips/mips/locore.S index e8702a019239..e3470b52ce78 100644 --- a/sys/mips/mips/locore.S +++ b/sys/mips/mips/locore.S @@ -70,7 +70,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .data #ifdef YAMON diff --git a/sys/mips/mips/mpboot.S b/sys/mips/mips/mpboot.S index 7b73c3f1bf0a..7487b317847d 100644 --- a/sys/mips/mips/mpboot.S +++ b/sys/mips/mips/mpboot.S @@ -30,7 +30,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text .set noat diff --git a/sys/mips/mips/octeon_cop2_swtch.S b/sys/mips/mips/octeon_cop2_swtch.S index 688db6b757a5..62b672ac64ef 100644 --- a/sys/mips/mips/octeon_cop2_swtch.S +++ b/sys/mips/mips/octeon_cop2_swtch.S @@ -30,7 +30,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder diff --git a/sys/mips/mips/support.S b/sys/mips/mips/support.S index 1ba72ce1df44..eb4cbe13b221 100644 --- a/sys/mips/mips/support.S +++ b/sys/mips/mips/support.S @@ -94,7 +94,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! diff --git a/sys/mips/mips/swtch.S b/sys/mips/mips/swtch.S index b4c7b03fb068..93db1fc05a20 100644 --- a/sys/mips/mips/swtch.S +++ b/sys/mips/mips/swtch.S @@ -64,7 +64,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! diff --git a/sys/mips/nlm/mpreset.S b/sys/mips/nlm/mpreset.S index 5a089fc19dee..2a31aaf5776b 100644 --- a/sys/mips/nlm/mpreset.S +++ b/sys/mips/nlm/mpreset.S @@ -38,7 +38,7 @@ #define SYS_REG_KSEG1(node, reg) (0xa0000000 + XLP_DEFAULT_IO_BASE + \ XLP_IO_SYS_OFFSET(node) + XLP_IO_PCI_HDRSZ + (reg) * 4) -#include "assym.s" +#include "assym.inc" .text .set noat diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index b9553c6be1b4..1d603ef0afe8 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -27,9 +27,9 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/intel \ SRCS+= bus_if.h device_if.h vnode_if.h # Needed for dtrace_asm.S -DPSRCS+= assym.s +DPSRCS+= assym.inc -# These are needed for assym.s +# These are needed for assym.inc SRCS+= opt_compat.h opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h #This is needed for dtrace.c @@ -53,7 +53,7 @@ EXPORT_SYMS= dtrace_register \ dtrace_unregister \ dtrace_probe_lookup -dtrace_asm.o: assym.s +dtrace_asm.o: assym.inc .include diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index 435fcc0da37c..a9a1ff5b1dee 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -17,13 +17,13 @@ SRCS= hyperv.c \ vmbus_xact.c SRCS+= acpi_if.h bus_if.h device_if.h opt_acpi.h pci_if.h pcib_if.h vmbus_if.h -# XXX: for assym.s +# XXX: for assym.inc SRCS+= opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h opt_compat.h .if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h .endif -DPSRCS+= assym.s +DPSRCS= assym.inc vmbus_vector.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 3eee639ee228..3cfe8c490507 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -19,9 +19,9 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c linux_event.c \ opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \ device_if.h bus_if.h \ linux${SFX}_support.s -DPSRCS= assym.s linux${SFX}_genassym.c +DPSRCS= assym.inc linux${SFX}_genassym.c -# XXX: for assym.s +# XXX: for assym.inc SRCS+= opt_kstack_pages.h opt_nfs.h opt_compat.h opt_hwpmc_hooks.h .if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h @@ -48,7 +48,7 @@ CLEANFILES= linux${SFX}_assym.h linux${SFX}_genassym.o linux${SFX}_locore.o linux${SFX}_assym.h: linux${SFX}_genassym.o sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET} -linux${SFX}_locore.o: linux${SFX}_assym.h assym.s +linux${SFX}_locore.o: linux${SFX}_assym.h assym.inc ${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s \ -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib \ -fno-omit-frame-pointer -fPIC \ @@ -56,7 +56,7 @@ linux${SFX}_locore.o: linux${SFX}_assym.h assym.s -Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-warn-common \ ${.IMPSRC} -o ${.TARGET} -linux${SFX}_support.o: linux${SFX}_assym.h assym.s +linux${SFX}_support.o: linux${SFX}_assym.h assym.inc ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 55b5a45cbf0a..88271117ad97 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -13,9 +13,9 @@ SRCS= linux_fork.c linux_dummy.c linux_file.c linux_event.c \ opt_inet6.h opt_compat.h opt_posix.h opt_usb.h \ vnode_if.h device_if.h bus_if.h \ linux_support.s -DPSRCS= assym.s linux_genassym.c +DPSRCS= assym.inc linux_genassym.c -# XXX: for assym.s +# XXX: for assym.inc SRCS+= opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h .if ${MACHINE_CPUARCH} == "i386" SRCS+= opt_apic.h @@ -40,7 +40,7 @@ ${VDSO}.so: linux_locore.o -S -g --binary-architecture i386:x86-64 linux_locore.o ${.TARGET} strip -N _binary_linux_locore_o_size ${.TARGET} -linux_support.o: assym.s linux_assym.h +linux_support.o: assym.inc linux_assym.h ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/modules/sgx/Makefile b/sys/modules/sgx/Makefile index 8448b12c35d4..ea9481ccc3f8 100644 --- a/sys/modules/sgx/Makefile +++ b/sys/modules/sgx/Makefile @@ -5,9 +5,9 @@ KMOD= sgx SRCS= sgx.c sgxvar.h sgx_support.S SRCS+= opt_compat.h opt_hwpmc_hooks.h opt_kstack_pages.h -DPSRCS= assym.s +DPSRCS= assym.inc -sgx_support.o: assym.s +sgx_support.o: assym.inc ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/powerpc/aim/locore32.S b/sys/powerpc/aim/locore32.S index f911c7bafa8b..75089ff518ef 100644 --- a/sys/powerpc/aim/locore32.S +++ b/sys/powerpc/aim/locore32.S @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include diff --git a/sys/powerpc/aim/locore64.S b/sys/powerpc/aim/locore64.S index 2ebdfe2116a5..ae2ef8f59323 100644 --- a/sys/powerpc/aim/locore64.S +++ b/sys/powerpc/aim/locore64.S @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include diff --git a/sys/powerpc/booke/locore.S b/sys/powerpc/booke/locore.S index b74ee5a2e4df..9ce2f019cad2 100644 --- a/sys/powerpc/booke/locore.S +++ b/sys/powerpc/booke/locore.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_hwpmc_hooks.h" diff --git a/sys/powerpc/powerpc/cpu_subr64.S b/sys/powerpc/powerpc/cpu_subr64.S index d85cd308369b..830b626d2b55 100644 --- a/sys/powerpc/powerpc/cpu_subr64.S +++ b/sys/powerpc/powerpc/cpu_subr64.S @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include diff --git a/sys/powerpc/powerpc/sigcode32.S b/sys/powerpc/powerpc/sigcode32.S index cd4c3cf72f9e..615e2237fabc 100644 --- a/sys/powerpc/powerpc/sigcode32.S +++ b/sys/powerpc/powerpc/sigcode32.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * The following code gets copied to the top of the user stack on process diff --git a/sys/powerpc/powerpc/sigcode64.S b/sys/powerpc/powerpc/sigcode64.S index 43d9ecbe0ac3..aa2709a828b3 100644 --- a/sys/powerpc/powerpc/sigcode64.S +++ b/sys/powerpc/powerpc/sigcode64.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * The following code gets copied to the top of the user stack on process diff --git a/sys/powerpc/powerpc/swtch32.S b/sys/powerpc/powerpc/swtch32.S index e8394625bcf5..88516bad9041 100644 --- a/sys/powerpc/powerpc/swtch32.S +++ b/sys/powerpc/powerpc/swtch32.S @@ -56,7 +56,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include diff --git a/sys/powerpc/powerpc/swtch64.S b/sys/powerpc/powerpc/swtch64.S index 6afdccb83cdb..4f37875aa65d 100644 --- a/sys/powerpc/powerpc/swtch64.S +++ b/sys/powerpc/powerpc/swtch64.S @@ -56,7 +56,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include diff --git a/sys/riscv/riscv/copyinout.S b/sys/riscv/riscv/copyinout.S index 44d68390d7b6..2440e5365787 100644 --- a/sys/riscv/riscv/copyinout.S +++ b/sys/riscv/riscv/copyinout.S @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include -#include "assym.s" +#include "assym.inc" /* * Fault handler for the copy{in,out} functions below. diff --git a/sys/riscv/riscv/exception.S b/sys/riscv/riscv/exception.S index b103b4d24a31..ef38fa1c108e 100644 --- a/sys/riscv/riscv/exception.S +++ b/sys/riscv/riscv/exception.S @@ -35,7 +35,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S index 20649929d321..84905084a066 100644 --- a/sys/riscv/riscv/locore.S +++ b/sys/riscv/riscv/locore.S @@ -34,7 +34,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include diff --git a/sys/riscv/riscv/support.S b/sys/riscv/riscv/support.S index 59e2680fa33e..df88acfead6f 100644 --- a/sys/riscv/riscv/support.S +++ b/sys/riscv/riscv/support.S @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include -#include "assym.s" +#include "assym.inc" /* * One of the fu* or su* functions failed, return -1. diff --git a/sys/riscv/riscv/swtch.S b/sys/riscv/riscv/swtch.S index 8753fddfb728..981ffbaac4f8 100644 --- a/sys/riscv/riscv/swtch.S +++ b/sys/riscv/riscv/swtch.S @@ -32,7 +32,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S index dc5a7a0001e5..a86c48b68f1c 100644 --- a/sys/sparc64/sparc64/exception.S +++ b/sys/sparc64/sparc64/exception.S @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" #define TSB_ASI 0x0 #define TSB_KERNEL 0x0 diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S index 179eeb6400dc..68af6c1b98d8 100644 --- a/sys/sparc64/sparc64/interrupt.S +++ b/sys/sparc64/sparc64/interrupt.S @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" /* * Handle a vectored interrupt. diff --git a/sys/sparc64/sparc64/locore.S b/sys/sparc64/sparc64/locore.S index 41f55a53a8b5..5be5cd4ab7b1 100644 --- a/sys/sparc64/sparc64/locore.S +++ b/sys/sparc64/sparc64/locore.S @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" .register %g2,#ignore diff --git a/sys/sparc64/sparc64/mp_exception.S b/sys/sparc64/sparc64/mp_exception.S index 9bd61b910021..cd4c73f8a088 100644 --- a/sys/sparc64/sparc64/mp_exception.S +++ b/sys/sparc64/sparc64/mp_exception.S @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore diff --git a/sys/sparc64/sparc64/mp_locore.S b/sys/sparc64/sparc64/mp_locore.S index fd4357eaec1f..cf30ccfbb69c 100644 --- a/sys/sparc64/sparc64/mp_locore.S +++ b/sys/sparc64/sparc64/mp_locore.S @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore diff --git a/sys/sparc64/sparc64/support.S b/sys/sparc64/sparc64/support.S index b446ddeac7ef..d8074d5e4464 100644 --- a/sys/sparc64/sparc64/support.S +++ b/sys/sparc64/sparc64/support.S @@ -39,7 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore diff --git a/sys/sparc64/sparc64/swtch.S b/sys/sparc64/sparc64/swtch.S index 49d3cf5b7573..536ff6b0cd13 100644 --- a/sys/sparc64/sparc64/swtch.S +++ b/sys/sparc64/sparc64/swtch.S @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" .register %g2, #ignore