git: ccd9b49f20e7 - main - sys: use .S for assembly language files that use the preprocessor
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 02 Nov 2022 14:29:18 UTC
The branch main has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=ccd9b49f20e7a2e6eac1e7e68db23e222bf40263
commit ccd9b49f20e7a2e6eac1e7e68db23e222bf40263
Author: Elliott Mitchell <ehem+freebsd@m5p.com>
AuthorDate: 2022-07-24 23:14:20 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
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 <i386/i386/atpic_vector.s>
+#include <i386/i386/atpic_vector.S>
#endif
#if defined(DEV_APIC) && defined(DEV_ATPIC)
@@ -449,7 +449,7 @@ ENTRY(fork_trampoline)
#endif
#ifdef DEV_APIC
-#include <i386/i386/apic_vector.s>
+#include <i386/i386/apic_vector.S>
#endif
#ifdef HYPERV
@@ -464,11 +464,11 @@ ENTRY(fork_trampoline)
.p2align 4
.text
SUPERALIGN_TEXT
-#include <i386/i386/vm86bios.s>
+#include <i386/i386/vm86bios.S>
.text
-#include <i386/i386/copyout_fast.s>
+#include <i386/i386/copyout_fast.S>
/*
* 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