From nobody Sun Nov 6 14:55:39 2022 X-Original-To: dev-commits-src-branches@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 4N4y8q5VYyz4hMcc; Sun, 6 Nov 2022 14:55:39 +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 4N4y8q4p0Bz3VbH; Sun, 6 Nov 2022 14:55:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667746539; 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=L5LRESCMnH8+2Raj7n3ltxL8AM8TbpHdRfplOSz9CTU=; b=balAN9BcqMAf3GeFm0K7P6oXUWGdslAYw6btZJ5xKvOxZas1WWhghi0mVJYWEzuwS3X7ul sudZaf9LtCuBaCpWkKAfQTus5r5BVpmLBGyGhG6eCBJ06hbMlGdQc4T2hndREU+VtvAl7Y BpIdqhxRmqZV0BCczPkZDxF6t6C7DR0ZJ5zt9aICBHSuhCT1fXFoq1G42tgEKp5kcLrORZ QAqwK26EH0DG32s59V2o3c2qRBrw2lBVZE3/9p5sAv+wnWe6GJZdF73fl6KOwfOeih/Qo3 U194VySLZaZqcWvimMBZlWEUp0H2oJB83ST1m11iS2J1X3meA7iG4Zuvqns++Q== 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 4N4y8q3vFFzQBl; Sun, 6 Nov 2022 14:55:39 +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 2A6Etdv0025652; Sun, 6 Nov 2022 14:55:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2A6EtdJi025651; Sun, 6 Nov 2022 14:55:39 GMT (envelope-from git) Date: Sun, 6 Nov 2022 14:55:39 GMT Message-Id: <202211061455.2A6EtdJi025651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 9dc3a403c34e - stable/13 - linux, linux64: improve SRCS formatting List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9dc3a403c34e0013370a19fe581cfd8cff2effa3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1667746539; 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=L5LRESCMnH8+2Raj7n3ltxL8AM8TbpHdRfplOSz9CTU=; b=d47sqoQ+hthxRs6/mAUgf7Lms03lLss9hKnn56zDnYUOMt8Hcch7GdIIUWea2Ka821kSge 5rvreXmVqpliTYhv8Yu99gV/E6oVF1kJdltRYf0KvES2Crq8joHj7mWlte68/knwMqyI8b CWVDBPohalbRTv5HwmHCcBXWIOAqVKaXopgG0gUwbteVQRwkImLmiXX7bKGuiQ8Q27Srhh rUtC+88B6KSREz9tz4cyp0Q6qqzVo2z9lq387FqvUynuCp9hq4OgNKmuQ+USDDH1CwWJ2F 4cWgnaV0tqxm3+XPfffKo/mXSW5SAkGy5bpl85rIzqD8hlGWfuHSvd6kkcsLRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1667746539; a=rsa-sha256; cv=none; b=Bp0F2fGBcmGCmUF9N7Q+IjEDrdnriWLYKoGWxXrrHxTpE4Q1V7uNw/V5mW+STYh4SD6PL7 Q9M3OMNw04CjUzR6EX46btfnxFfKlcYtzlLINAxBlxP3Qp8qUw4WmXskieSiwWqiewATbD 3aGPpnJAs982fxc/U87FjQy4neM+/vveaqpAM6vNKGmJhWIG0v60aybcRK/xMh8xSM3ORR JcgIIZhslJn85umJk3BUGXYYLeJ7gEFB48cZKWurc/pOk30bxKacGmGD+Bbl+IQ99D23Eb vnrusOTWIgrQzW/uuaxeCP0ciZl6/5Wa+RHYTjg35XNNsKnjgmsj6/4V/xwpsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=9dc3a403c34e0013370a19fe581cfd8cff2effa3 commit 9dc3a403c34e0013370a19fe581cfd8cff2effa3 Author: Mitchell Horne AuthorDate: 2022-10-29 15:28:16 +0000 Commit: Mitchell Horne CommitDate: 2022-11-06 14:54:46 +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 (cherry picked from commit 331784880821c6aa55188d0950e98d898c42203c) --- 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