The branch main has been updated by mhorne:
URL:
https://cgit.FreeBSD.org/src/commit/?id=331784880821c6aa55188d0950e98d898c42203c
commit 331784880821c6aa55188d0950e98d898c42203c
Author: Mitchell Horne <mho...@freebsd.org>
AuthorDate: 2022-10-29 15:28:16 +0000
Commit: Mitchell Horne <mho...@freebsd.org>
CommitDate: 2022-10-29 16:11:24 +0000
linux, linux64: improve SRCS formatting
Sort the entries alphabetically, and list them with one entry per line.
This makes the diffs much cleaner when adding or removing a new entry,
as I will do in the next commit.
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
---
sys/modules/linux/Makefile | 52 ++++++++++++++++++++++++++++++++++----------
sys/modules/linux64/Makefile | 36 ++++++++++++++++++++++++------
2 files changed, 69 insertions(+), 19 deletions(-)
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 46087dede53f..808f87f87dc7 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -11,14 +11,34 @@ CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32
.endif
KMOD= linux
-SRCS= linux_fork.c linux${SFX}_dummy_machdep.c linux_file.c linux_event.c \
- linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
- linux${SFX}_machdep.c linux_misc.c linux_signal.c \
- linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
- linux${SFX}_sysvec.c linux_uid16.c linux_time.c \
- linux_timer.c linux_vdso.c linux_rseq.c \
- opt_inet6.h opt_compat.h opt_posix.h opt_usb.h vnode_if.h \
- device_if.h bus_if.h
+SRCS= linux${SFX}_dummy_machdep.c \
+ linux_event.c \
+ linux_file.c \
+ linux_fork.c \
+ linux_futex.c \
+ linux_getcwd.c \
+ linux_ioctl.c \
+ linux_ipc.c \
+ linux${SFX}_machdep.c \
+ linux_misc.c \
+ linux_rseq.c \
+ linux_signal.c \
+ linux_socket.c \
+ linux_stats.c \
+ linux_sysctl.c \
+ linux${SFX}_sysent.c \
+ linux${SFX}_sysvec.c \
+ linux_time.c \
+ linux_timer.c \
+ linux_uid16.c \
+ linux_vdso.c \
+ opt_compat.h \
+ opt_inet6.h \
+ opt_posix.h \
+ opt_usb.h \
+ bus_if.h \
+ device_if.h \
+ vnode_if.h
.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
SRCS+= linux_dummy_x86.c
VDSODEPS=linux_vdso_gettc_x86.inc
@@ -34,15 +54,23 @@ DPSRCS= assym.inc linux${SFX}_genassym.c
# XXX: for assym.inc
SRCS+= opt_kstack_pages.h opt_nfs.h opt_hwpmc_hooks.h
.if ${MACHINE_CPUARCH} == "i386"
-SRCS+= opt_apic.h
+SRCS+= opt_apic.h opt_cpu.h
.endif
OBJS= linux${SFX}_vdso.so
.if ${MACHINE_CPUARCH} == "i386"
-SRCS+= linux_ptrace_machdep.c imgact_linux.c linux_util.c linux_mib.c \
- linux_mmap.c linux_dummy.c linux_emul.c linux_errno.c opt_cpu.h linux.c
\
- linux_x86.c linux_vdso_selector_x86.c
+SRCS+= imgact_linux.c \
+ linux.c \
+ linux_dummy.c \
+ linux_emul.c \
+ linux_errno.c \
+ linux_mib.c \
+ linux_mmap.c \
+ linux_ptrace_machdep.c \
+ linux_util.c \
+ linux_vdso_selector_x86.c \
+ linux_x86.c
.endif
.if ${MACHINE_CPUARCH} == "i386"
diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile
index fd1363679513..3d7b973742e9 100644
--- a/sys/modules/linux64/Makefile
+++ b/sys/modules/linux64/Makefile
@@ -6,13 +6,35 @@
.endif
KMOD= linux64
-SRCS= linux_elf64.c linux_fork.c linux_dummy_machdep.c linux_file.c \
- linux_event.c linux_futex.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
- linux_machdep.c linux_misc.c linux_ptrace.c linux_signal.c \
- linux_socket.c linux_stats.c linux_sysctl.c linux_sysent.c \
- linux_sysvec.c linux_time.c linux_vdso.c linux_timer.c linux_rseq.c \
- opt_compat.h opt_inet6.h opt_posix.h opt_usb.h \
- vnode_if.h device_if.h bus_if.h \
+SRCS= linux_dummy_machdep.c \
+ linux_elf64.c \
+ linux_event.c \
+ linux_file.c \
+ linux_fork.c \
+ linux_futex.c \
+ linux_getcwd.c \
+ linux_ioctl.c \
+ linux_ipc.c \
+ linux_machdep.c \
+ linux_misc.c \
+ linux_ptrace.c \
+ linux_rseq.c \
+ linux_signal.c \
+ linux_socket.c \
+ linux_stats.c \
+ linux_sysctl.c \
+ linux_sysent.c \
+ linux_sysvec.c \
+ linux_time.c \
+ linux_vdso.c \
+ linux_timer.c \
+ opt_compat.h \
+ opt_inet6.h \
+ opt_posix.h \
+ opt_usb.h \
+ bus_if.h \
+ device_if.h \
+ vnode_if.h \
linux_support.s
.if ${MACHINE_CPUARCH} == "amd64"
SRCS+= linux_dummy_x86.c
