From nobody Tue Dec 14 00:44:54 2021 X-Original-To: dev-commits-src-all@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 288C418D03E9; Tue, 14 Dec 2021 00:44:55 +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 4JCfm66Ktsz4m7Z; Tue, 14 Dec 2021 00:44:54 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BA6481EB07; Tue, 14 Dec 2021 00:44:54 +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 1BE0iscs012110; Tue, 14 Dec 2021 00:44:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BE0isbh012109; Tue, 14 Dec 2021 00:44:54 GMT (envelope-from git) Date: Tue, 14 Dec 2021 00:44:54 GMT Message-Id: <202112140044.1BE0isbh012109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bd914cea9e5e - stable/13 - amd64: Only build aout.ko when COMPAT_FREEBSD32 is enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bd914cea9e5eafdbd182b4388a73e1002113cede Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639442694; 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=kf5T5WqRF1C+qHRpWY9KUF9jaYXJc0Of7NacmYUUl1Q=; b=l4pajvXFA5LknaSqaE3iJYAyp55GGdi7egftBCCHAgekJycJ59HVQWMnffeibsFudF1Y4e 8yuCiVZWynflwzlKbmelFuRvbMxRqKxELvdVBUd43M3Ljr/jMf2JzsvdtLgwUF81nyGjS2 ZGxm+C9yV8pNpNCX+lM3lh+VT3ox4kKnYQRHIKCH0tRxHxCxZfxH3NRgoiqkbwYOjCdqFg LzhqBBxRrpaLShblCU20O8KaKB3fwqgg7MHkrPF9RzamuSxIJgMMcywYXgA0xGT1zE95U5 JnHU6/DOdsS9M9ye6zhqelnTxqCIal4q1HmXt2pvVSba9HhydUqsLkjoPfpvbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639442694; a=rsa-sha256; cv=none; b=Fy3kQoae3KGIBxOa/R5x+N92iFo2AIYx3BK7GmW5PqQA/AgFet2tp4V7aIge0WxagrBkVn uisVFlFjGJHjE5j2sF9BlpsWm1/pYGR6LqHvi6kq4XBCjlf3+7uu1y6afBk3bDEr4vWf9p M7tGx1VatJb2yPw1Ks4JM/tPvi1AaHD7l5skQzxYMI/mR/Ee4KgFzDD1fl4AtrzjEsv1VS uoI6rgzhr4NSKcYYtkF1BPUOO2cZOYB8wNxwz8wTsA+IEU4NlLEOublNsiQQp9T3Sph756 GwLMF4ibhDzPndhFXPIvoPyvscjU2cwHFBO69FqopyCKYfSQsGgztbjzidC4QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd914cea9e5eafdbd182b4388a73e1002113cede commit bd914cea9e5eafdbd182b4388a73e1002113cede Author: Konstantin Belousov AuthorDate: 2021-12-06 23:11:10 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-14 00:44:01 +0000 amd64: Only build aout.ko when COMPAT_FREEBSD32 is enabled (cherry picked from commit 0f2d88d1ebbba796adb0492781b683cbfe25bd2d) --- sys/conf/kern.post.mk | 4 ++++ sys/conf/kern.pre.mk | 2 ++ sys/modules/Makefile | 2 ++ 3 files changed, 8 insertions(+) diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 7df67e24f445..79a6d3b516ca 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -50,6 +50,10 @@ MKMODULESENV+= SAN_CFLAGS="${SAN_CFLAGS}" MKMODULESENV+= GCOV_CFLAGS="${GCOV_CFLAGS}" .endif +.if !empty(COMPAT_FREEBSD32_ENABLED) +MKMODULESENV+= COMPAT_FREEBSD32_ENABLED="yes" +.endif + # Allow overriding the kernel debug directory, so kernel and user debug may be # installed in different directories. Setting it to "" restores the historical # behavior of installing debug files in the kernel directory. diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 9730ade8a8b9..d6ab5e17a82a 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -108,6 +108,8 @@ PROF= -pg .endif DEFINED_PROF= ${PROF} +COMPAT_FREEBSD32_ENABLED!= grep COMPAT_FREEBSD32 opt_global.h || true ; echo + KASAN_ENABLED!= grep KASAN opt_global.h || true ; echo .if !empty(KASAN_ENABLED) SAN_CFLAGS+= -fsanitize=kernel-address \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 4db2b7311ee1..d2ff9b5405c2 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -627,7 +627,9 @@ _sdhci_fdt= sdhci_fdt .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp _an= an +.if ${MACHINE_CPUARCH} == "i386" || !empty(COMPAT_FREEBSD32_ENABLED) _aout= aout +.endif _bios= bios .if ${MK_SOURCELESS_UCODE} != "no" _bxe= bxe