Index: head/sys/amd64/acpica/acpi_wakecode.S =================================================================== --- head/sys/amd64/acpica/acpi_wakecode.S +++ head/sys/amd64/acpica/acpi_wakecode.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Resume entry point for real mode. Index: head/sys/amd64/amd64/apic_vector.S =================================================================== --- head/sys/amd64/amd64/apic_vector.S +++ head/sys/amd64/amd64/apic_vector.S @@ -44,7 +44,7 @@ #include "opt_smp.h" -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/amd64/amd64/atpic_vector.S =================================================================== --- head/sys/amd64/amd64/atpic_vector.S +++ head/sys/amd64/amd64/atpic_vector.S @@ -36,7 +36,7 @@ * master and slave interrupt controllers. */ -#include "assym.s" +#include "assym.inc" #include /* Index: head/sys/amd64/amd64/cpu_switch.S =================================================================== --- head/sys/amd64/amd64/cpu_switch.S +++ head/sys/amd64/amd64/cpu_switch.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" /*****************************************************************************/ Index: head/sys/amd64/amd64/exception.S =================================================================== --- head/sys/amd64/amd64/exception.S +++ head/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 Index: head/sys/amd64/amd64/locore.S =================================================================== --- head/sys/amd64/amd64/locore.S +++ head/sys/amd64/amd64/locore.S @@ -31,7 +31,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Compiled KERNBASE location Index: head/sys/amd64/amd64/mpboot.S =================================================================== --- head/sys/amd64/amd64/mpboot.S +++ head/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 */ Index: head/sys/amd64/amd64/sigtramp.S =================================================================== --- head/sys/amd64/amd64/sigtramp.S +++ head/sys/amd64/amd64/sigtramp.S @@ -30,7 +30,7 @@ #include -#include "assym.s" +#include "assym.inc" .text /********************************************************************** Index: head/sys/amd64/amd64/support.S =================================================================== --- head/sys/amd64/amd64/support.S +++ head/sys/amd64/amd64/support.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text Index: head/sys/amd64/amd64/xen-locore.S =================================================================== --- head/sys/amd64/amd64/xen-locore.S +++ head/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") Index: head/sys/amd64/ia32/ia32_exception.S =================================================================== --- head/sys/amd64/ia32/ia32_exception.S +++ head/sys/amd64/ia32/ia32_exception.S @@ -28,7 +28,7 @@ #include -#include "assym.s" +#include "assym.inc" .text /* Index: head/sys/amd64/linux/linux_support.s =================================================================== --- head/sys/amd64/linux/linux_support.s +++ head/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) Index: head/sys/amd64/linux32/linux32_support.s =================================================================== --- head/sys/amd64/linux32/linux32_support.s +++ head/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) Index: head/sys/amd64/sgx/sgx_support.S =================================================================== --- head/sys/amd64/sgx/sgx_support.S +++ head/sys/amd64/sgx/sgx_support.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text Index: head/sys/arm/arm/bcopy_page.S =================================================================== --- head/sys/arm/arm/bcopy_page.S +++ head/sys/arm/arm/bcopy_page.S @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" #ifndef _ARM_ARCH_5E Index: head/sys/arm/arm/bcopyinout.S =================================================================== --- head/sys/arm/arm/bcopyinout.S +++ head/sys/arm/arm/bcopyinout.S @@ -36,7 +36,7 @@ */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/arm/arm/copystr.S =================================================================== --- head/sys/arm/arm/copystr.S +++ head/sys/arm/arm/copystr.S @@ -38,7 +38,7 @@ * Created : 16/05/95 */ -#include "assym.s" +#include "assym.inc" #include #include __FBSDID("$FreeBSD$"); Index: head/sys/arm/arm/cpu_asm-v6.S =================================================================== --- head/sys/arm/arm/cpu_asm-v6.S +++ head/sys/arm/arm/cpu_asm-v6.S @@ -26,7 +26,7 @@ * * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/arm/arm/exception.S =================================================================== --- head/sys/arm/arm/exception.S +++ head/sys/arm/arm/exception.S @@ -46,7 +46,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/arm/arm/fusu.S =================================================================== --- head/sys/arm/arm/fusu.S +++ head/sys/arm/arm/fusu.S @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" __FBSDID("$FreeBSD$"); .syntax unified Index: head/sys/arm/arm/hypervisor-stub.S =================================================================== --- head/sys/arm/arm/hypervisor-stub.S +++ head/sys/arm/arm/hypervisor-stub.S @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include #include #include Index: head/sys/arm/arm/in_cksum_arm.S =================================================================== --- head/sys/arm/arm/in_cksum_arm.S +++ head/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 Index: head/sys/arm/arm/locore-v4.S =================================================================== --- head/sys/arm/arm/locore-v4.S +++ head/sys/arm/arm/locore-v4.S @@ -33,7 +33,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include #include Index: head/sys/arm/arm/locore-v6.S =================================================================== --- head/sys/arm/arm/locore-v6.S +++ head/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 Index: head/sys/arm/arm/support.S =================================================================== --- head/sys/arm/arm/support.S +++ head/sys/arm/arm/support.S @@ -89,7 +89,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .syntax unified Index: head/sys/arm/arm/swtch-v4.S =================================================================== --- head/sys/arm/arm/swtch-v4.S +++ head/sys/arm/arm/swtch-v4.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include Index: head/sys/arm/arm/swtch-v6.S =================================================================== --- head/sys/arm/arm/swtch-v6.S +++ head/sys/arm/arm/swtch-v6.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include Index: head/sys/arm/arm/swtch.S =================================================================== --- head/sys/arm/arm/swtch.S +++ head/sys/arm/arm/swtch.S @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/arm64/arm64/bzero.S =================================================================== --- head/sys/arm64/arm64/bzero.S +++ head/sys/arm64/arm64/bzero.S @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" /* * void bzero(void *p, size_t size) Index: head/sys/arm64/arm64/copyinout.S =================================================================== --- head/sys/arm64/arm64/copyinout.S +++ head/sys/arm64/arm64/copyinout.S @@ -35,7 +35,7 @@ #include -#include "assym.s" +#include "assym.inc" /* * Fault handler for the copy{in,out} functions below. Index: head/sys/arm64/arm64/exception.S =================================================================== --- head/sys/arm64/arm64/exception.S +++ head/sys/arm64/arm64/exception.S @@ -29,7 +29,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .text Index: head/sys/arm64/arm64/locore.S =================================================================== --- head/sys/arm64/arm64/locore.S +++ head/sys/arm64/arm64/locore.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include #include Index: head/sys/arm64/arm64/support.S =================================================================== --- head/sys/arm64/arm64/support.S +++ head/sys/arm64/arm64/support.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * One of the fu* or su* functions failed, return -1. Index: head/sys/arm64/arm64/swtch.S =================================================================== --- head/sys/arm64/arm64/swtch.S +++ head/sys/arm64/arm64/swtch.S @@ -29,7 +29,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include "opt_sched.h" Index: head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S +++ head/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) Index: head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S +++ head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define INTR_POP \ MEXITCOUNT; \ Index: head/sys/cddl/dev/dtrace/arm/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/arm/dtrace_asm.S +++ head/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) Index: head/sys/cddl/dev/dtrace/i386/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/i386/dtrace_asm.S +++ head/sys/cddl/dev/dtrace/i386/dtrace_asm.S @@ -32,7 +32,7 @@ #include #include -#include "assym.s" +#include "assym.inc" ENTRY(dtrace_invop_start) Index: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S +++ head/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 Index: head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S =================================================================== --- head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S +++ head/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) Index: head/sys/conf/files.amd64 =================================================================== --- head/sys/conf/files.amd64 +++ head/sys/conf/files.amd64 @@ -105,7 +105,7 @@ # 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" Index: head/sys/conf/files.i386 =================================================================== --- head/sys/conf/files.i386 +++ head/sys/conf/files.i386 @@ -443,7 +443,7 @@ 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" Index: head/sys/conf/kern.post.mk =================================================================== --- head/sys/conf/kern.post.mk +++ head/sys/conf/kern.post.mk @@ -155,7 +155,7 @@ .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 @@ ${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 @@ .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 Index: head/sys/conf/kmod.mk =================================================================== --- head/sys/conf/kmod.mk +++ head/sys/conf/kmod.mk @@ -454,14 +454,14 @@ ${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} Index: head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S =================================================================== --- head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S +++ head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S =================================================================== --- head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S +++ head/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. Index: head/sys/i386/acpica/acpi_wakecode.S =================================================================== --- head/sys/i386/acpica/acpi_wakecode.S +++ head/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 Index: head/sys/i386/i386/apic_vector.s =================================================================== --- head/sys/i386/i386/apic_vector.s +++ head/sys/i386/i386/apic_vector.s @@ -42,7 +42,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text SUPERALIGN_TEXT Index: head/sys/i386/i386/atpic_vector.s =================================================================== --- head/sys/i386/i386/atpic_vector.s +++ head/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. Index: head/sys/i386/i386/bioscall.s =================================================================== --- head/sys/i386/i386/bioscall.s +++ head/sys/i386/i386/bioscall.s @@ -32,7 +32,7 @@ #include -#include "assym.s" +#include "assym.inc" .data ALIGN_DATA Index: head/sys/i386/i386/exception.s =================================================================== --- head/sys/i386/i386/exception.s +++ head/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) */ Index: head/sys/i386/i386/locore.s =================================================================== --- head/sys/i386/i386/locore.s +++ head/sys/i386/i386/locore.s @@ -52,7 +52,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * XXX Index: head/sys/i386/i386/mpboot.s =================================================================== --- head/sys/i386/i386/mpboot.s +++ head/sys/i386/i386/mpboot.s @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define R(x) ((x)-KERNBASE) Index: head/sys/i386/i386/sigtramp.s =================================================================== --- head/sys/i386/i386/sigtramp.s +++ head/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 Index: head/sys/i386/i386/support.s =================================================================== --- head/sys/i386/i386/support.s +++ head/sys/i386/i386/support.s @@ -34,7 +34,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define IDXSHIFT 10 Index: head/sys/i386/i386/swtch.s =================================================================== --- head/sys/i386/i386/swtch.s +++ head/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 Index: head/sys/i386/i386/vm86bios.s =================================================================== --- head/sys/i386/i386/vm86bios.s +++ head/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 */ Index: head/sys/i386/linux/linux_locore.s =================================================================== --- head/sys/i386/linux/linux_locore.s +++ head/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 Index: head/sys/i386/linux/linux_support.s =================================================================== --- head/sys/i386/linux/linux_support.s +++ head/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 Index: head/sys/mips/cavium/octeon_cop2.S =================================================================== --- head/sys/mips/cavium/octeon_cop2.S +++ head/sys/mips/cavium/octeon_cop2.S @@ -29,7 +29,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder Index: head/sys/mips/ingenic/jz4780_mpboot.S =================================================================== --- head/sys/mips/ingenic/jz4780_mpboot.S +++ head/sys/mips/ingenic/jz4780_mpboot.S @@ -27,7 +27,7 @@ */ #include -#include "assym.s" +#include "assym.inc" .text .set noat Index: head/sys/mips/mips/exception.S =================================================================== --- head/sys/mips/mips/exception.S +++ head/sys/mips/mips/exception.S @@ -63,7 +63,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Index: head/sys/mips/mips/fp.S =================================================================== --- head/sys/mips/mips/fp.S +++ head/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 Index: head/sys/mips/mips/locore.S =================================================================== --- head/sys/mips/mips/locore.S +++ head/sys/mips/mips/locore.S @@ -70,7 +70,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .data #ifdef YAMON Index: head/sys/mips/mips/mpboot.S =================================================================== --- head/sys/mips/mips/mpboot.S +++ head/sys/mips/mips/mpboot.S @@ -30,7 +30,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .text .set noat Index: head/sys/mips/mips/octeon_cop2_swtch.S =================================================================== --- head/sys/mips/mips/octeon_cop2_swtch.S +++ head/sys/mips/mips/octeon_cop2_swtch.S @@ -30,7 +30,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder Index: head/sys/mips/mips/support.S =================================================================== --- head/sys/mips/mips/support.S +++ head/sys/mips/mips/support.S @@ -94,7 +94,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Index: head/sys/mips/mips/swtch.S =================================================================== --- head/sys/mips/mips/swtch.S +++ head/sys/mips/mips/swtch.S @@ -64,7 +64,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Index: head/sys/mips/nlm/mpreset.S =================================================================== --- head/sys/mips/nlm/mpreset.S +++ head/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 Index: head/sys/modules/dtrace/dtrace/Makefile =================================================================== --- head/sys/modules/dtrace/dtrace/Makefile +++ head/sys/modules/dtrace/dtrace/Makefile @@ -27,9 +27,9 @@ 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 @@ dtrace_unregister \ dtrace_probe_lookup -dtrace_asm.o: assym.s +dtrace_asm.o: assym.inc .include Index: head/sys/modules/hyperv/vmbus/Makefile =================================================================== --- head/sys/modules/hyperv/vmbus/Makefile +++ head/sys/modules/hyperv/vmbus/Makefile @@ -17,13 +17,13 @@ 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} \ Index: head/sys/modules/linux/Makefile =================================================================== --- head/sys/modules/linux/Makefile +++ head/sys/modules/linux/Makefile @@ -19,9 +19,9 @@ 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 @@ 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 @@ -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} Index: head/sys/modules/linux64/Makefile =================================================================== --- head/sys/modules/linux64/Makefile +++ head/sys/modules/linux64/Makefile @@ -13,9 +13,9 @@ 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 @@ -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} Index: head/sys/modules/sgx/Makefile =================================================================== --- head/sys/modules/sgx/Makefile +++ head/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} Index: head/sys/powerpc/aim/locore32.S =================================================================== --- head/sys/powerpc/aim/locore32.S +++ head/sys/powerpc/aim/locore32.S @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include Index: head/sys/powerpc/aim/locore64.S =================================================================== --- head/sys/powerpc/aim/locore64.S +++ head/sys/powerpc/aim/locore64.S @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include Index: head/sys/powerpc/booke/locore.S =================================================================== --- head/sys/powerpc/booke/locore.S +++ head/sys/powerpc/booke/locore.S @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_hwpmc_hooks.h" Index: head/sys/powerpc/powerpc/cpu_subr64.S =================================================================== --- head/sys/powerpc/powerpc/cpu_subr64.S +++ head/sys/powerpc/powerpc/cpu_subr64.S @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include Index: head/sys/powerpc/powerpc/sigcode32.S =================================================================== --- head/sys/powerpc/powerpc/sigcode32.S +++ head/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 Index: head/sys/powerpc/powerpc/sigcode64.S =================================================================== --- head/sys/powerpc/powerpc/sigcode64.S +++ head/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 Index: head/sys/powerpc/powerpc/swtch32.S =================================================================== --- head/sys/powerpc/powerpc/swtch32.S +++ head/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 Index: head/sys/powerpc/powerpc/swtch64.S =================================================================== --- head/sys/powerpc/powerpc/swtch64.S +++ head/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 Index: head/sys/riscv/riscv/copyinout.S =================================================================== --- head/sys/riscv/riscv/copyinout.S +++ head/sys/riscv/riscv/copyinout.S @@ -37,7 +37,7 @@ #include -#include "assym.s" +#include "assym.inc" /* * Fault handler for the copy{in,out} functions below. Index: head/sys/riscv/riscv/exception.S =================================================================== --- head/sys/riscv/riscv/exception.S +++ head/sys/riscv/riscv/exception.S @@ -35,7 +35,7 @@ #include __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/riscv/riscv/locore.S =================================================================== --- head/sys/riscv/riscv/locore.S +++ head/sys/riscv/riscv/locore.S @@ -34,7 +34,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include #include Index: head/sys/riscv/riscv/support.S =================================================================== --- head/sys/riscv/riscv/support.S +++ head/sys/riscv/riscv/support.S @@ -37,7 +37,7 @@ #include -#include "assym.s" +#include "assym.inc" /* * One of the fu* or su* functions failed, return -1. Index: head/sys/riscv/riscv/swtch.S =================================================================== --- head/sys/riscv/riscv/swtch.S +++ head/sys/riscv/riscv/swtch.S @@ -32,7 +32,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include Index: head/sys/sparc64/sparc64/exception.S =================================================================== --- head/sys/sparc64/sparc64/exception.S +++ head/sys/sparc64/sparc64/exception.S @@ -74,7 +74,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #define TSB_ASI 0x0 #define TSB_KERNEL 0x0 Index: head/sys/sparc64/sparc64/interrupt.S =================================================================== --- head/sys/sparc64/sparc64/interrupt.S +++ head/sys/sparc64/sparc64/interrupt.S @@ -33,7 +33,7 @@ #include #include -#include "assym.s" +#include "assym.inc" /* * Handle a vectored interrupt. Index: head/sys/sparc64/sparc64/locore.S =================================================================== --- head/sys/sparc64/sparc64/locore.S +++ head/sys/sparc64/sparc64/locore.S @@ -33,7 +33,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .register %g2,#ignore Index: head/sys/sparc64/sparc64/mp_exception.S =================================================================== --- head/sys/sparc64/sparc64/mp_exception.S +++ head/sys/sparc64/sparc64/mp_exception.S @@ -33,7 +33,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore Index: head/sys/sparc64/sparc64/mp_locore.S =================================================================== --- head/sys/sparc64/sparc64/mp_locore.S +++ head/sys/sparc64/sparc64/mp_locore.S @@ -36,7 +36,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore Index: head/sys/sparc64/sparc64/support.S =================================================================== --- head/sys/sparc64/sparc64/support.S +++ head/sys/sparc64/sparc64/support.S @@ -39,7 +39,7 @@ #include #include -#include "assym.s" +#include "assym.inc" .register %g2, #ignore .register %g3, #ignore Index: head/sys/sparc64/sparc64/swtch.S =================================================================== --- head/sys/sparc64/sparc64/swtch.S +++ head/sys/sparc64/sparc64/swtch.S @@ -35,7 +35,7 @@ #include #include -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" .register %g2, #ignore