From nobody Wed Nov 2 14:29:18 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4N2TmG5MFZz4hHNd; Wed, 2 Nov 2022 14:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4N2TmG4s3Fz3Nvm; Wed, 2 Nov 2022 14:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667399358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHZbEopIQyMktjQgNPpHkLXH/UgXbApbtkyp1jzCnas=; b=jKimmohMUaz2IXo5zae33BAgnvB2pQSE44hmm9WR2FatWboR5JotudMQGP4nhyBIeLQcx6 goi2qWUADXNOb0HHCrjBrL3YpoGks5Sqzb73az+0C/HrJVg0WdiURfvGooSJ+zMtlFbWYL O791+yG8QiRyT1ZErInl4ykWhOJM+FURLZwCfgdPr9OwDrjn0yqE9YVR8D8jLeOhRDR5eU OOOw9b9+wz7J4wWAJYchmn5zrgHm1NGP41YySS/58ZdrMmqvv78viyTA49dqk93yjDVL5T PCBpNH1yJcGS0/vdCe2YOco2egrK5elSkoMcvM1tHHfEdSHh41s4kbxsQwwCtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4N2TmG3wXpz10HC; Wed, 2 Nov 2022 14:29:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2A2ETIvA037818; Wed, 2 Nov 2022 14:29:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A2ETIlJ037817; Wed, 2 Nov 2022 14:29:18 GMT (envelope-from git) Date: Wed, 2 Nov 2022 14:29:18 GMT Message-Id: <202211021429.2A2ETIlJ037817@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ccd9b49f20e7 - main - sys: use .S for assembly language files that use the preprocessor List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ccd9b49f20e7a2e6eac1e7e68db23e222bf40263 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667399358; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uHZbEopIQyMktjQgNPpHkLXH/UgXbApbtkyp1jzCnas=; b=JpPoX6I75EHUr4TLKXaW7eCo7RTfLT6okc2kllx2dC0sP3wlr26roadB6HPvnDw16WQfWR 7Boah6WReIWmllt/EJz6KRa6qkf15WcEgx0kVnH4NRDgAMagmxffPDrpNuc39xfpwTwm7I tSW0dtBe/kEQtExGPeTioj3JqhN3S5hevzj9DPKbfbPeL0Kra9OBrBkdv+eArB7M+mHHb3 ehkXjj9fHinJdb2GHQikEgDwTk9XF/oR0ztyUgRYb4tJ4c67QaCP8spf+Qxnt8JugqM7/n 9ZOn2HMdA49K9h6pXTjfjFj7QVzbw1V86op0pB+RsEZNd1gKvlK/1UTWtjQ0FA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667399358; a=rsa-sha256; cv=none; b=NJuBIII3f304nf2mjXgZxWJbBHpO5TNI1Q38zlz/4S02cYxMrDBR8Pfmsvzi7rWwXfVhNP eOY8gtDidnYPWZ1NW14ZXPBL9SWT3WhZsnCqeHP3ZjGvJhDyY1ex5nwRQEScjlDvVt05RN Fhq9tmewLElHXSX5Af8hxqGMEHgda4jFaYGKnhD/DLvm/9FjuBeuC3E8BbQ1JX8HZK0u0j Z4Q0zomUqZyqfzpglunspEbYlQB9amwpNEWY6oTE0JDvbU479/SFfEOn7VECCjhgX/sbUz v9q6Uw0r9jEAyGjkpXAqVPTKyqkpc0/QxpTp2CpyTDm2XGUrIMta8YNTQWGvRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ccd9b49f20e7a2e6eac1e7e68db23e222bf40263 commit ccd9b49f20e7a2e6eac1e7e68db23e222bf40263 Author: Elliott Mitchell AuthorDate: 2022-07-24 23:14:20 +0000 Commit: Ed Maste CommitDate: 2022-11-02 14:29:00 +0000 sys: use .S for assembly language files that use the preprocessor Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/609 Differential Revision: https://reviews.freebsd.org/D35908 --- sys/amd64/linux/{linux_support.s => linux_support.S} | 0 .../linux32/{linux32_support.s => linux32_support.S} | 0 sys/arm/arm/{setstack.s => setstack.S} | 0 sys/arm64/linux/{linux_support.s => linux_support.S} | 0 sys/conf/files.arm | 2 +- sys/conf/files.i386 | 16 ++++++++-------- sys/i386/i386/{apic_vector.s => apic_vector.S} | 0 sys/i386/i386/{atpic_vector.s => atpic_vector.S} | 0 sys/i386/i386/{bioscall.s => bioscall.S} | 0 sys/i386/i386/{copyout_fast.s => copyout_fast.S} | 0 sys/i386/i386/{exception.s => exception.S} | 8 ++++---- sys/i386/i386/{locore.s => locore.S} | 0 sys/i386/i386/{mpboot.s => mpboot.S} | 0 sys/i386/i386/{sigtramp.s => sigtramp.S} | 0 sys/i386/i386/{support.s => support.S} | 0 sys/i386/i386/{swtch.s => swtch.S} | 0 sys/i386/i386/{vm86bios.s => vm86bios.S} | 0 sys/modules/linux/Makefile | 2 +- sys/modules/linux64/Makefile | 2 +- 19 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/amd64/linux/linux_support.s b/sys/amd64/linux/linux_support.S similarity index 100% rename from sys/amd64/linux/linux_support.s rename to sys/amd64/linux/linux_support.S diff --git a/sys/amd64/linux32/linux32_support.s b/sys/amd64/linux32/linux32_support.S similarity index 100% rename from sys/amd64/linux32/linux32_support.s rename to sys/amd64/linux32/linux32_support.S diff --git a/sys/arm/arm/setstack.s b/sys/arm/arm/setstack.S similarity index 100% rename from sys/arm/arm/setstack.s rename to sys/arm/arm/setstack.S diff --git a/sys/arm64/linux/linux_support.s b/sys/arm64/linux/linux_support.S similarity index 100% rename from sys/arm64/linux/linux_support.s rename to sys/arm64/linux/linux_support.S diff --git a/sys/conf/files.arm b/sys/conf/files.arm index e31c3b9c8b60..de7dfdffa591 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -62,7 +62,7 @@ arm/arm/pmu_fdt.c optional fdt pmu | fdt hwpmc arm/arm/ptrace_machdep.c standard arm/arm/sc_machdep.c optional sc arm/arm/setcpsr.S standard -arm/arm/setstack.s standard +arm/arm/setstack.S standard arm/arm/stack_machdep.c optional ddb | stack arm/arm/stdatomic.c standard \ compile-with "${NORMAL_C:N-Wmissing-prototypes}" diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 2517bfa82dc1..d35a00829f4d 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -94,9 +94,9 @@ acpi_wakedata.h optional acpi \ # i386/bios/smapi.c optional smapi i386/bios/smapi_bios.S optional smapi -#i386/i386/apic_vector.s optional apic +#i386/i386/apic_vector.S optional apic i386/i386/bios.c standard -i386/i386/bioscall.s standard +i386/i386/bioscall.S standard i386/i386/bpf_jit_machdep.c optional bpf_jitter i386/i386/copyout.c standard i386/i386/db_disasm.c optional ddb @@ -105,14 +105,14 @@ i386/i386/db_trace.c optional ddb i386/i386/exec_machdep.c standard i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris i386/i386/elf_machdep.c standard -i386/i386/exception.s standard +i386/i386/exception.S standard i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/in_cksum_machdep.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io i386/i386/k6_mem.c optional mem -i386/i386/locore.s standard no-obj +i386/i386/locore.S standard no-obj i386/i386/longrun.c optional cpu_enable_longrun i386/i386/machdep.c standard i386/i386/mem.c optional mem @@ -121,16 +121,16 @@ i386/i386/minidump_machdep_pae.c standard i386/i386/minidump_machdep_nopae.c standard i386/i386/mp_clock.c optional smp i386/i386/mp_machdep.c optional smp -i386/i386/mpboot.s optional smp +i386/i386/mpboot.S optional smp i386/i386/npx.c standard i386/i386/perfmon.c optional perfmon i386/i386/pmap_base.c standard i386/i386/pmap_nopae.c standard i386/i386/pmap_pae.c standard i386/i386/ptrace_machdep.c standard -i386/i386/sigtramp.s standard -i386/i386/support.s standard -i386/i386/swtch.s standard +i386/i386/sigtramp.S standard +i386/i386/support.S standard +i386/i386/swtch.S standard i386/i386/sys_machdep.c standard i386/i386/trap.c standard i386/i386/uio_machdep.c standard diff --git a/sys/i386/i386/apic_vector.s b/sys/i386/i386/apic_vector.S similarity index 100% rename from sys/i386/i386/apic_vector.s rename to sys/i386/i386/apic_vector.S diff --git a/sys/i386/i386/atpic_vector.s b/sys/i386/i386/atpic_vector.S similarity index 100% rename from sys/i386/i386/atpic_vector.s rename to sys/i386/i386/atpic_vector.S diff --git a/sys/i386/i386/bioscall.s b/sys/i386/i386/bioscall.S similarity index 100% rename from sys/i386/i386/bioscall.s rename to sys/i386/i386/bioscall.S diff --git a/sys/i386/i386/copyout_fast.s b/sys/i386/i386/copyout_fast.S similarity index 100% rename from sys/i386/i386/copyout_fast.s rename to sys/i386/i386/copyout_fast.S diff --git a/sys/i386/i386/exception.s b/sys/i386/i386/exception.S similarity index 99% rename from sys/i386/i386/exception.s rename to sys/i386/i386/exception.S index 1a950b80b9b6..05cd2d7e3073 100644 --- a/sys/i386/i386/exception.s +++ b/sys/i386/i386/exception.S @@ -438,7 +438,7 @@ ENTRY(fork_trampoline) SUPERALIGN_TEXT #ifdef DEV_ATPIC -#include +#include #endif #if defined(DEV_APIC) && defined(DEV_ATPIC) @@ -449,7 +449,7 @@ ENTRY(fork_trampoline) #endif #ifdef DEV_APIC -#include +#include #endif #ifdef HYPERV @@ -464,11 +464,11 @@ ENTRY(fork_trampoline) .p2align 4 .text SUPERALIGN_TEXT -#include +#include .text -#include +#include /* * void doreti(struct trapframe) diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.S similarity index 100% rename from sys/i386/i386/locore.s rename to sys/i386/i386/locore.S diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.S similarity index 100% rename from sys/i386/i386/mpboot.s rename to sys/i386/i386/mpboot.S diff --git a/sys/i386/i386/sigtramp.s b/sys/i386/i386/sigtramp.S similarity index 100% rename from sys/i386/i386/sigtramp.s rename to sys/i386/i386/sigtramp.S diff --git a/sys/i386/i386/support.s b/sys/i386/i386/support.S similarity index 100% rename from sys/i386/i386/support.s rename to sys/i386/i386/support.S diff --git a/sys/i386/i386/swtch.s b/sys/i386/i386/swtch.S similarity index 100% rename from sys/i386/i386/swtch.s rename to sys/i386/i386/swtch.S diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.S similarity index 100% rename from sys/i386/i386/vm86bios.s rename to sys/i386/i386/vm86bios.S diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 5f39ece3adb2..f761459d2bd9 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -46,7 +46,7 @@ SRCS+= linux_dummy_x86.c VDSODEPS=linux_vdso_gettc_x86.inc .endif .if ${MACHINE_CPUARCH} == "amd64" -SRCS+= linux${SFX}_support.s +SRCS+= linux${SFX}_support.S SRCS+= linux_elf32.c .else SRCS+= linux_copyout.c diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index 0857f4e7126f..f6f750e5216d 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -37,7 +37,7 @@ SRCS= linux_dummy_machdep.c \ bus_if.h \ device_if.h \ vnode_if.h \ - linux_support.s + linux_support.S .if ${MACHINE_CPUARCH} == "amd64" SRCS+= linux_dummy_x86.c .endif