Author: emaste Date: Tue Mar 20 17:58:51 2018 New Revision: 331254 URL: https://svnweb.freebsd.org/changeset/base/331254
Log: 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 Modified: head/sys/amd64/acpica/acpi_wakecode.S head/sys/amd64/amd64/apic_vector.S head/sys/amd64/amd64/atpic_vector.S head/sys/amd64/amd64/cpu_switch.S head/sys/amd64/amd64/exception.S head/sys/amd64/amd64/locore.S head/sys/amd64/amd64/mpboot.S head/sys/amd64/amd64/sigtramp.S head/sys/amd64/amd64/support.S head/sys/amd64/amd64/xen-locore.S head/sys/amd64/ia32/ia32_exception.S head/sys/amd64/linux/linux_support.s head/sys/amd64/linux32/linux32_support.s head/sys/amd64/sgx/sgx_support.S head/sys/arm/arm/bcopy_page.S head/sys/arm/arm/bcopyinout.S head/sys/arm/arm/copystr.S head/sys/arm/arm/cpu_asm-v6.S head/sys/arm/arm/exception.S head/sys/arm/arm/fusu.S head/sys/arm/arm/hypervisor-stub.S head/sys/arm/arm/in_cksum_arm.S head/sys/arm/arm/locore-v4.S head/sys/arm/arm/locore-v6.S head/sys/arm/arm/support.S head/sys/arm/arm/swtch-v4.S head/sys/arm/arm/swtch-v6.S head/sys/arm/arm/swtch.S head/sys/arm64/arm64/bzero.S head/sys/arm64/arm64/copyinout.S head/sys/arm64/arm64/exception.S head/sys/arm64/arm64/locore.S head/sys/arm64/arm64/support.S head/sys/arm64/arm64/swtch.S head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S head/sys/cddl/dev/dtrace/arm/dtrace_asm.S head/sys/cddl/dev/dtrace/i386/dtrace_asm.S head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/conf/kern.post.mk head/sys/conf/kmod.mk head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S head/sys/i386/acpica/acpi_wakecode.S head/sys/i386/i386/apic_vector.s head/sys/i386/i386/atpic_vector.s head/sys/i386/i386/bioscall.s head/sys/i386/i386/exception.s head/sys/i386/i386/locore.s head/sys/i386/i386/mpboot.s head/sys/i386/i386/sigtramp.s head/sys/i386/i386/support.s head/sys/i386/i386/swtch.s head/sys/i386/i386/vm86bios.s head/sys/i386/linux/linux_locore.s head/sys/i386/linux/linux_support.s head/sys/mips/cavium/octeon_cop2.S head/sys/mips/ingenic/jz4780_mpboot.S head/sys/mips/mips/exception.S head/sys/mips/mips/fp.S head/sys/mips/mips/locore.S head/sys/mips/mips/mpboot.S head/sys/mips/mips/octeon_cop2_swtch.S head/sys/mips/mips/support.S head/sys/mips/mips/swtch.S head/sys/mips/nlm/mpreset.S head/sys/modules/dtrace/dtrace/Makefile head/sys/modules/hyperv/vmbus/Makefile head/sys/modules/linux/Makefile head/sys/modules/linux64/Makefile head/sys/modules/sgx/Makefile head/sys/powerpc/aim/locore32.S head/sys/powerpc/aim/locore64.S head/sys/powerpc/booke/locore.S head/sys/powerpc/powerpc/cpu_subr64.S head/sys/powerpc/powerpc/sigcode32.S head/sys/powerpc/powerpc/sigcode64.S head/sys/powerpc/powerpc/swtch32.S head/sys/powerpc/powerpc/swtch64.S head/sys/riscv/riscv/copyinout.S head/sys/riscv/riscv/exception.S head/sys/riscv/riscv/locore.S head/sys/riscv/riscv/support.S head/sys/riscv/riscv/swtch.S head/sys/sparc64/sparc64/exception.S head/sys/sparc64/sparc64/interrupt.S head/sys/sparc64/sparc64/locore.S head/sys/sparc64/sparc64/mp_exception.S head/sys/sparc64/sparc64/mp_locore.S head/sys/sparc64/sparc64/support.S head/sys/sparc64/sparc64/swtch.S Modified: head/sys/amd64/acpica/acpi_wakecode.S ============================================================================== --- head/sys/amd64/acpica/acpi_wakecode.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/acpica/acpi_wakecode.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/specialreg.h> #include <machine/timerreg.h> -#include "assym.s" +#include "assym.inc" /* * Resume entry point for real mode. Modified: head/sys/amd64/amd64/apic_vector.S ============================================================================== --- head/sys/amd64/amd64/apic_vector.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/apic_vector.S Tue Mar 20 17:58:51 2018 (r331254) @@ -44,7 +44,7 @@ #include "opt_smp.h" -#include "assym.s" +#include "assym.inc" #include <machine/asmacros.h> #include <machine/specialreg.h> Modified: head/sys/amd64/amd64/atpic_vector.S ============================================================================== --- head/sys/amd64/amd64/atpic_vector.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/atpic_vector.S Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ * master and slave interrupt controllers. */ -#include "assym.s" +#include "assym.inc" #include <machine/asmacros.h> /* Modified: head/sys/amd64/amd64/cpu_switch.S ============================================================================== --- head/sys/amd64/amd64/cpu_switch.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/cpu_switch.S Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ #include <machine/asmacros.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" /*****************************************************************************/ Modified: head/sys/amd64/amd64/exception.S ============================================================================== --- head/sys/amd64/amd64/exception.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/exception.S Tue Mar 20 17:58:51 2018 (r331254) @@ -42,7 +42,7 @@ #include "opt_compat.h" #include "opt_hwpmc_hooks.h" -#include "assym.s" +#include "assym.inc" #include <machine/asmacros.h> #include <machine/psl.h> Modified: head/sys/amd64/amd64/locore.S ============================================================================== --- head/sys/amd64/amd64/locore.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/locore.S Tue Mar 20 17:58:51 2018 (r331254) @@ -31,7 +31,7 @@ #include <machine/pmap.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" /* * Compiled KERNBASE location Modified: head/sys/amd64/amd64/mpboot.S ============================================================================== --- head/sys/amd64/amd64/mpboot.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/mpboot.S Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ #include <machine/asmacros.h> /* miscellaneous asm macros */ #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" .data /* So we can modify it */ Modified: head/sys/amd64/amd64/sigtramp.S ============================================================================== --- head/sys/amd64/amd64/sigtramp.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/sigtramp.S Tue Mar 20 17:58:51 2018 (r331254) @@ -30,7 +30,7 @@ #include <machine/asmacros.h> -#include "assym.s" +#include "assym.inc" .text /********************************************************************** Modified: head/sys/amd64/amd64/support.S ============================================================================== --- head/sys/amd64/amd64/support.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/support.S Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ #include <machine/specialreg.h> #include <machine/pmap.h> -#include "assym.s" +#include "assym.inc" .text Modified: head/sys/amd64/amd64/xen-locore.S ============================================================================== --- head/sys/amd64/amd64/xen-locore.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/amd64/xen-locore.S Tue Mar 20 17:58:51 2018 (r331254) @@ -40,7 +40,7 @@ #define __ASSEMBLY__ #include <xen/interface/elfnote.h> -#include "assym.s" +#include "assym.inc" .section __xen_guest ELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz, "FreeBSD") Modified: head/sys/amd64/ia32/ia32_exception.S ============================================================================== --- head/sys/amd64/ia32/ia32_exception.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/ia32/ia32_exception.S Tue Mar 20 17:58:51 2018 (r331254) @@ -28,7 +28,7 @@ #include <machine/asmacros.h> -#include "assym.s" +#include "assym.inc" .text /* Modified: head/sys/amd64/linux/linux_support.s ============================================================================== --- head/sys/amd64/linux/linux_support.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/linux/linux_support.s Tue Mar 20 17:58:51 2018 (r331254) @@ -31,7 +31,7 @@ #include "linux_assym.h" /* system definitions */ #include <machine/asmacros.h> /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault: movq $0,PCB_ONFAULT(%r8) Modified: head/sys/amd64/linux32/linux32_support.s ============================================================================== --- head/sys/amd64/linux32/linux32_support.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/linux32/linux32_support.s Tue Mar 20 17:58:51 2018 (r331254) @@ -31,7 +31,7 @@ #include "linux32_assym.h" /* system definitions */ #include <machine/asmacros.h> /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault: movq $0,PCB_ONFAULT(%r8) Modified: head/sys/amd64/sgx/sgx_support.S ============================================================================== --- head/sys/amd64/sgx/sgx_support.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/amd64/sgx/sgx_support.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/asmacros.h> #include <amd64/sgx/sgxvar.h> -#include "assym.s" +#include "assym.inc" .text Modified: head/sys/arm/arm/bcopy_page.S ============================================================================== --- head/sys/arm/arm/bcopy_page.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/bcopy_page.S Tue Mar 20 17:58:51 2018 (r331254) @@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" #ifndef _ARM_ARCH_5E Modified: head/sys/arm/arm/bcopyinout.S ============================================================================== --- head/sys/arm/arm/bcopyinout.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/bcopyinout.S Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> #include <sys/errno.h> Modified: head/sys/arm/arm/copystr.S ============================================================================== --- head/sys/arm/arm/copystr.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/copystr.S Tue Mar 20 17:58:51 2018 (r331254) @@ -38,7 +38,7 @@ * Created : 16/05/95 */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> #include <machine/armreg.h> __FBSDID("$FreeBSD$"); Modified: head/sys/arm/arm/cpu_asm-v6.S ============================================================================== --- head/sys/arm/arm/cpu_asm-v6.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/cpu_asm-v6.S Tue Mar 20 17:58:51 2018 (r331254) @@ -26,7 +26,7 @@ * * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> #include <machine/asmacros.h> Modified: head/sys/arm/arm/exception.S ============================================================================== --- head/sys/arm/arm/exception.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/exception.S Tue Mar 20 17:58:51 2018 (r331254) @@ -46,7 +46,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> #include <machine/armreg.h> Modified: head/sys/arm/arm/fusu.S ============================================================================== --- head/sys/arm/arm/fusu.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/fusu.S Tue Mar 20 17:58:51 2018 (r331254) @@ -35,7 +35,7 @@ #include <machine/asm.h> #include <machine/armreg.h> -#include "assym.s" +#include "assym.inc" __FBSDID("$FreeBSD$"); .syntax unified Modified: head/sys/arm/arm/hypervisor-stub.S ============================================================================== --- head/sys/arm/arm/hypervisor-stub.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/hypervisor-stub.S Tue Mar 20 17:58:51 2018 (r331254) @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include <sys/syscall.h> #include <machine/asm.h> #include <machine/asmacros.h> Modified: head/sys/arm/arm/in_cksum_arm.S ============================================================================== --- head/sys/arm/arm/in_cksum_arm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/in_cksum_arm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -43,7 +43,7 @@ #include "opt_inet.h" #include <machine/asm.h> -#include "assym.s" +#include "assym.inc" __FBSDID("$FreeBSD$"); .syntax unified Modified: head/sys/arm/arm/locore-v4.S ============================================================================== --- head/sys/arm/arm/locore-v4.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/locore-v4.S Tue Mar 20 17:58:51 2018 (r331254) @@ -33,7 +33,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include <sys/syscall.h> #include <machine/asm.h> #include <machine/armreg.h> Modified: head/sys/arm/arm/locore-v6.S ============================================================================== --- head/sys/arm/arm/locore-v6.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/locore-v6.S Tue Mar 20 17:58:51 2018 (r331254) @@ -28,7 +28,7 @@ * SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include <sys/syscall.h> #include <machine/asm.h> #include <machine/asmacros.h> @@ -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 Modified: head/sys/arm/arm/support.S ============================================================================== --- head/sys/arm/arm/support.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/support.S Tue Mar 20 17:58:51 2018 (r331254) @@ -89,7 +89,7 @@ #include <machine/asm.h> __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .syntax unified Modified: head/sys/arm/arm/swtch-v4.S ============================================================================== --- head/sys/arm/arm/swtch-v4.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/swtch-v4.S Tue Mar 20 17:58:51 2018 (r331254) @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include <machine/asm.h> Modified: head/sys/arm/arm/swtch-v6.S ============================================================================== --- head/sys/arm/arm/swtch-v6.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/swtch-v6.S Tue Mar 20 17:58:51 2018 (r331254) @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include <machine/asm.h> Modified: head/sys/arm/arm/swtch.S ============================================================================== --- head/sys/arm/arm/swtch.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm/arm/swtch.S Tue Mar 20 17:58:51 2018 (r331254) @@ -78,7 +78,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> #include <machine/asmacros.h> Modified: head/sys/arm64/arm64/bzero.S ============================================================================== --- head/sys/arm64/arm64/bzero.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/bzero.S Tue Mar 20 17:58:51 2018 (r331254) @@ -30,7 +30,7 @@ __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" /* * void bzero(void *p, size_t size) Modified: head/sys/arm64/arm64/copyinout.S ============================================================================== --- head/sys/arm64/arm64/copyinout.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/copyinout.S Tue Mar 20 17:58:51 2018 (r331254) @@ -35,7 +35,7 @@ __FBSDID("$FreeBSD$"); #include <machine/vmparam.h> -#include "assym.s" +#include "assym.inc" /* * Fault handler for the copy{in,out} functions below. Modified: head/sys/arm64/arm64/exception.S ============================================================================== --- head/sys/arm64/arm64/exception.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/exception.S Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ #include <machine/armreg.h> __FBSDID("$FreeBSD$"); -#include "assym.s" +#include "assym.inc" .text Modified: head/sys/arm64/arm64/locore.S ============================================================================== --- head/sys/arm64/arm64/locore.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/locore.S Tue Mar 20 17:58:51 2018 (r331254) @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include <sys/syscall.h> #include <machine/asm.h> Modified: head/sys/arm64/arm64/support.S ============================================================================== --- head/sys/arm64/arm64/support.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/support.S Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ __FBSDID("$FreeBSD$"); #include <machine/param.h> #include <machine/vmparam.h> -#include "assym.s" +#include "assym.inc" /* * One of the fu* or su* functions failed, return -1. Modified: head/sys/arm64/arm64/swtch.S ============================================================================== --- head/sys/arm64/arm64/swtch.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/arm64/arm64/swtch.S Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ * */ -#include "assym.s" +#include "assym.inc" #include "opt_kstack_pages.h" #include "opt_sched.h" Modified: head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/aarch64/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -35,7 +35,7 @@ #include <machine/armreg.h> #include <machine/asm.h> -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) Modified: head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/amd64/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <sys/cpuvar_defs.h> #include <sys/dtrace.h> -#include "assym.s" +#include "assym.inc" #define INTR_POP \ MEXITCOUNT; \ Modified: head/sys/cddl/dev/dtrace/arm/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/arm/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/arm/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -35,7 +35,7 @@ #include <machine/asm.h> #include <machine/armreg.h> -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) Modified: head/sys/cddl/dev/dtrace/i386/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/i386/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/i386/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -32,7 +32,7 @@ #include <sys/cpuvar_defs.h> #include <sys/dtrace.h> -#include "assym.s" +#include "assym.inc" ENTRY(dtrace_invop_start) Modified: head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/powerpc/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -28,7 +28,7 @@ * Use is subject to license terms. */ -#include "assym.s" +#include "assym.inc" #define _ASM Modified: head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S ============================================================================== --- head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/cddl/dev/dtrace/riscv/dtrace_asm.S Tue Mar 20 17:58:51 2018 (r331254) @@ -37,7 +37,7 @@ #include <machine/riscvreg.h> #include <machine/asm.h> -#include "assym.s" +#include "assym.inc" /* void dtrace_membar_producer(void) Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/conf/files.amd64 Tue Mar 20 17:58:51 2018 (r331254) @@ -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" Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/conf/files.i386 Tue Mar 20 17:58:51 2018 (r331254) @@ -443,7 +443,7 @@ dev/isci/scil/scif_sas_task_request_states.c optiona 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" Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/conf/kern.post.mk Tue Mar 20 17:58:51 2018 (r331254) @@ -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 Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/conf/kmod.mk Tue Mar 20 17:58:51 2018 (r331254) @@ -454,14 +454,14 @@ acpi_quirks.h: ${SYSDIR}/tools/acpi_quirks2h.awk ${SYS ${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} Modified: head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S ============================================================================== --- head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/dev/hyperv/vmbus/amd64/vmbus_vector.S Tue Mar 20 17:58:51 2018 (r331254) @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include <machine/asmacros.h> #include <machine/specialreg.h> Modified: head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S ============================================================================== --- head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/dev/hyperv/vmbus/i386/vmbus_vector.S Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ #include <machine/asmacros.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" /* * This is the Hyper-V vmbus channel direct callback interrupt. Modified: head/sys/i386/acpica/acpi_wakecode.S ============================================================================== --- head/sys/i386/acpica/acpi_wakecode.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/acpica/acpi_wakecode.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/specialreg.h> #include <machine/timerreg.h> -#include "assym.s" +#include "assym.inc" /* * Resume entry point. The BIOS enters here in real mode after POST with Modified: head/sys/i386/i386/apic_vector.s ============================================================================== --- head/sys/i386/i386/apic_vector.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/apic_vector.s Tue Mar 20 17:58:51 2018 (r331254) @@ -42,7 +42,7 @@ #include <machine/specialreg.h> #include <x86/apicreg.h> -#include "assym.s" +#include "assym.inc" .text SUPERALIGN_TEXT Modified: head/sys/i386/i386/atpic_vector.s ============================================================================== --- head/sys/i386/i386/atpic_vector.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/atpic_vector.s Tue Mar 20 17:58:51 2018 (r331254) @@ -38,7 +38,7 @@ #include <machine/asmacros.h> -#include "assym.s" +#include "assym.inc" /* * Macros for interrupt entry, call to handler, and exit. Modified: head/sys/i386/i386/bioscall.s ============================================================================== --- head/sys/i386/i386/bioscall.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/bioscall.s Tue Mar 20 17:58:51 2018 (r331254) @@ -32,7 +32,7 @@ #include <machine/asmacros.h> -#include "assym.s" +#include "assym.inc" .data ALIGN_DATA Modified: head/sys/i386/i386/exception.s ============================================================================== --- head/sys/i386/i386/exception.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/exception.s Tue Mar 20 17:58:51 2018 (r331254) @@ -42,7 +42,7 @@ #include <machine/psl.h> #include <machine/trap.h> -#include "assym.s" +#include "assym.inc #define SEL_RPL_MASK 0x0003 #define GSEL_KPL 0x0020 /* GSEL(GCODE_SEL, SEL_KPL) */ Modified: head/sys/i386/i386/locore.s ============================================================================== --- head/sys/i386/i386/locore.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/locore.s Tue Mar 20 17:58:51 2018 (r331254) @@ -52,7 +52,7 @@ #include <machine/pmap.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" /* * XXX Modified: head/sys/i386/i386/mpboot.s ============================================================================== --- head/sys/i386/i386/mpboot.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/mpboot.s Tue Mar 20 17:58:51 2018 (r331254) @@ -35,7 +35,7 @@ #include <x86/apicreg.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" #define R(x) ((x)-KERNBASE) Modified: head/sys/i386/i386/sigtramp.s ============================================================================== --- head/sys/i386/i386/sigtramp.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/sigtramp.s Tue Mar 20 17:58:51 2018 (r331254) @@ -45,7 +45,7 @@ #include <machine/asmacros.h> #include <machine/psl.h> -#include "assym.s" +#include "assym.inc" /* * Signal trampoline, copied to top of user stack Modified: head/sys/i386/i386/support.s ============================================================================== --- head/sys/i386/i386/support.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/support.s Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/pmap.h> #include <machine/specialreg.h> -#include "assym.s" +#include "assym.inc" #define IDXSHIFT 10 Modified: head/sys/i386/i386/swtch.s ============================================================================== --- head/sys/i386/i386/swtch.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/swtch.s Tue Mar 20 17:58:51 2018 (r331254) @@ -36,7 +36,7 @@ #include <machine/asmacros.h> -#include "assym.s" +#include "assym.inc" #if defined(SMP) && defined(SCHED_ULE) #define SETOP xchgl Modified: head/sys/i386/i386/vm86bios.s ============================================================================== --- head/sys/i386/i386/vm86bios.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/i386/vm86bios.s Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ #include <machine/asmacros.h> /* miscellaneous asm macros */ #include <machine/trap.h> -#include "assym.s" +#include "assym.inc" #define SCR_NEWPTD PCB_ESI /* readability macros */ #define SCR_VMFRAME PCB_EBP /* see vm86.c for explanation */ Modified: head/sys/i386/linux/linux_locore.s ============================================================================== --- head/sys/i386/linux/linux_locore.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/linux/linux_locore.s Tue Mar 20 17:58:51 2018 (r331254) @@ -5,7 +5,7 @@ #include <i386/linux/linux_syscall.h> /* system call numbers */ -#include "assym.s" +#include "assym.inc" /* * To avoid excess stack frame the signal trampoline code emulates Modified: head/sys/i386/linux/linux_support.s ============================================================================== --- head/sys/i386/linux/linux_support.s Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/i386/linux/linux_support.s Tue Mar 20 17:58:51 2018 (r331254) @@ -31,7 +31,7 @@ #include "linux_assym.h" /* system definitions */ #include <machine/asmacros.h> /* miscellaneous asm macros */ -#include "assym.s" +#include "assym.inc" futex_fault_decx: movl PCPU(CURPCB),%ecx Modified: head/sys/mips/cavium/octeon_cop2.S ============================================================================== --- head/sys/mips/cavium/octeon_cop2.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/cavium/octeon_cop2.S Tue Mar 20 17:58:51 2018 (r331254) @@ -29,7 +29,7 @@ #include <machine/asm.h> #include <mips/cavium/octeon_cop2.h> -#include "assym.s" +#include "assym.inc" .set noreorder Modified: head/sys/mips/ingenic/jz4780_mpboot.S ============================================================================== --- head/sys/mips/ingenic/jz4780_mpboot.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/ingenic/jz4780_mpboot.S Tue Mar 20 17:58:51 2018 (r331254) @@ -27,7 +27,7 @@ */ #include <machine/asm.h> -#include "assym.s" +#include "assym.inc" .text .set noat Modified: head/sys/mips/mips/exception.S ============================================================================== --- head/sys/mips/mips/exception.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/exception.S Tue Mar 20 17:58:51 2018 (r331254) @@ -63,7 +63,7 @@ #include <machine/pte.h> #include <machine/pcb.h> -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Modified: head/sys/mips/mips/fp.S ============================================================================== --- head/sys/mips/mips/fp.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/fp.S Tue Mar 20 17:58:51 2018 (r331254) @@ -43,7 +43,7 @@ #include <machine/regnum.h> #include <machine/cpuregs.h> -#include "assym.s" +#include "assym.inc" #define SEXP_INF 0xff #define DEXP_INF 0x7ff Modified: head/sys/mips/mips/locore.S ============================================================================== --- head/sys/mips/mips/locore.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/locore.S Tue Mar 20 17:58:51 2018 (r331254) @@ -70,7 +70,7 @@ #include <machine/cpuregs.h> #include <machine/regnum.h> -#include "assym.s" +#include "assym.inc" .data #ifdef YAMON Modified: head/sys/mips/mips/mpboot.S ============================================================================== --- head/sys/mips/mips/mpboot.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/mpboot.S Tue Mar 20 17:58:51 2018 (r331254) @@ -30,7 +30,7 @@ #include <machine/cpu.h> #include <machine/cpuregs.h> -#include "assym.s" +#include "assym.inc" .text .set noat Modified: head/sys/mips/mips/octeon_cop2_swtch.S ============================================================================== --- head/sys/mips/mips/octeon_cop2_swtch.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/octeon_cop2_swtch.S Tue Mar 20 17:58:51 2018 (r331254) @@ -30,7 +30,7 @@ #include <machine/cpuregs.h> #include <machine/octeon_cop2.h> -#include "assym.s" +#include "assym.inc" .set noreorder Modified: head/sys/mips/mips/support.S ============================================================================== --- head/sys/mips/mips/support.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/support.S Tue Mar 20 17:58:51 2018 (r331254) @@ -94,7 +94,7 @@ #include <machine/cpuregs.h> #include <machine/pcb.h> -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Modified: head/sys/mips/mips/swtch.S ============================================================================== --- head/sys/mips/mips/swtch.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/mips/swtch.S Tue Mar 20 17:58:51 2018 (r331254) @@ -64,7 +64,7 @@ #include <machine/pte.h> #include <machine/pcb.h> -#include "assym.s" +#include "assym.inc" .set noreorder # Noreorder is default style! Modified: head/sys/mips/nlm/mpreset.S ============================================================================== --- head/sys/mips/nlm/mpreset.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/mips/nlm/mpreset.S Tue Mar 20 17:58:51 2018 (r331254) @@ -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 Modified: head/sys/modules/dtrace/dtrace/Makefile ============================================================================== --- head/sys/modules/dtrace/dtrace/Makefile Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/modules/dtrace/dtrace/Makefile Tue Mar 20 17:58:51 2018 (r331254) @@ -27,9 +27,9 @@ CFLAGS+= -I${SYSDIR}/cddl/contrib/opensolaris/uts/inte 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 <bsd.kmod.mk> Modified: head/sys/modules/hyperv/vmbus/Makefile ============================================================================== --- head/sys/modules/hyperv/vmbus/Makefile Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/modules/hyperv/vmbus/Makefile Tue Mar 20 17:58:51 2018 (r331254) @@ -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} \ Modified: head/sys/modules/linux/Makefile ============================================================================== --- head/sys/modules/linux/Makefile Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/modules/linux/Makefile Tue Mar 20 17:58:51 2018 (r331254) @@ -19,9 +19,9 @@ SRCS= linux_fork.c linux${SFX}_dummy.c linux_file.c li 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}_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} Modified: head/sys/modules/linux64/Makefile ============================================================================== --- head/sys/modules/linux64/Makefile Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/modules/linux64/Makefile Tue Mar 20 17:58:51 2018 (r331254) @@ -13,9 +13,9 @@ SRCS= linux_fork.c linux_dummy.c linux_file.c linux_ev 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} Modified: head/sys/modules/sgx/Makefile ============================================================================== --- head/sys/modules/sgx/Makefile Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/modules/sgx/Makefile Tue Mar 20 17:58:51 2018 (r331254) @@ -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} Modified: head/sys/powerpc/aim/locore32.S ============================================================================== --- head/sys/powerpc/aim/locore32.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/aim/locore32.S Tue Mar 20 17:58:51 2018 (r331254) @@ -25,7 +25,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include <sys/syscall.h> Modified: head/sys/powerpc/aim/locore64.S ============================================================================== --- head/sys/powerpc/aim/locore64.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/aim/locore64.S Tue Mar 20 17:58:51 2018 (r331254) @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include <sys/syscall.h> Modified: head/sys/powerpc/booke/locore.S ============================================================================== --- head/sys/powerpc/booke/locore.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/booke/locore.S Tue Mar 20 17:58:51 2018 (r331254) @@ -26,7 +26,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include "opt_hwpmc_hooks.h" Modified: head/sys/powerpc/powerpc/cpu_subr64.S ============================================================================== --- head/sys/powerpc/powerpc/cpu_subr64.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/powerpc/cpu_subr64.S Tue Mar 20 17:58:51 2018 (r331254) @@ -27,7 +27,7 @@ * $FreeBSD$ */ -#include "assym.s" +#include "assym.inc" #include <machine/asm.h> Modified: head/sys/powerpc/powerpc/sigcode32.S ============================================================================== --- head/sys/powerpc/powerpc/sigcode32.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/powerpc/sigcode32.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/asm.h> #include <sys/syscall.h> -#include "assym.s" +#include "assym.inc" /* * The following code gets copied to the top of the user stack on process Modified: head/sys/powerpc/powerpc/sigcode64.S ============================================================================== --- head/sys/powerpc/powerpc/sigcode64.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/powerpc/sigcode64.S Tue Mar 20 17:58:51 2018 (r331254) @@ -34,7 +34,7 @@ #include <machine/asm.h> #include <sys/syscall.h> -#include "assym.s" +#include "assym.inc" /* * The following code gets copied to the top of the user stack on process Modified: head/sys/powerpc/powerpc/swtch32.S ============================================================================== --- head/sys/powerpc/powerpc/swtch32.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/powerpc/swtch32.S Tue Mar 20 17:58:51 2018 (r331254) @@ -56,7 +56,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include <sys/syscall.h> Modified: head/sys/powerpc/powerpc/swtch64.S ============================================================================== --- head/sys/powerpc/powerpc/swtch64.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/powerpc/powerpc/swtch64.S Tue Mar 20 17:58:51 2018 (r331254) @@ -56,7 +56,7 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "assym.s" +#include "assym.inc" #include "opt_sched.h" #include <sys/syscall.h> Modified: head/sys/riscv/riscv/copyinout.S ============================================================================== --- head/sys/riscv/riscv/copyinout.S Tue Mar 20 17:47:29 2018 (r331253) +++ head/sys/riscv/riscv/copyinout.S Tue Mar 20 17:58:51 2018 (r331254) @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include <sys/errno.h> *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
