From nobody Tue Dec 7 00:11:13 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 9429B18CF605; Tue, 7 Dec 2021 00:11:14 +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 4J7LLV0CVZz3snx; Tue, 7 Dec 2021 00:11:13 +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 D45A715C8E; Tue, 7 Dec 2021 00:11:13 +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 1B70BDTM002691; Tue, 7 Dec 2021 00:11:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B70BD1C002690; Tue, 7 Dec 2021 00:11:13 GMT (envelope-from git) Date: Tue, 7 Dec 2021 00:11:13 GMT Message-Id: <202112070011.1B70BD1C002690@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0f2d88d1ebbb - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0f2d88d1ebbba796adb0492781b683cbfe25bd2d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638835874; 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=JkYx+sNdtxs9MyZUBi0nL+Cd6mVJNFmfJewo51lD/r0=; b=tQ0ViPhIzPT517Xv2JEkNGY9ViIGQoBHMDF4YUR2djjNMSglTHQ6/G+dNB0t7FGGpJd0Ya hS2KCqXGXg7mnjWlBjr5ApuwR/oPzfLMQf0A6o/ZVPyqAZykpYVELr7PNRwpiLn9LQqO4Y vePm8AFeX9gT4Y+qw4b9kKBeB7k3qh2rE0jS0Ejp/X5nCKLrAI08gkj6HqDiIQAW+47Tkh +z9HFGdar70M5iJgo+NGB5QVWLe1ToyMwh6G+lMB9CIh4xvMjdup0Yr0X7aKjZ2joD19nD 0Z0I0TVNtLhAfs3RlKbjUWf1F6CiNG/y47X5eQMkxqqf3eE1foWhDa1JO97YZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638835874; a=rsa-sha256; cv=none; b=LqooULKE8Jn6Umw6zXuCjBCXzZw62HlBoI1irsV1GzxNF3IWSjxy+MEwJvX83c1dld2pHo gvHsjwKll7+2cXItVyHfqs295efycy4ErcwVW08ktm2Lp7CNeHyupdvaEfukOsdjBxagJi kRg5ox26UZR7zg+ps0Gk8zbvcokHGYnn5ZujGBJ+hE/CiawobRU5qXqv0T1Tz+DEh6AI9f tddCeUX7OSHjppDPLLJ9G7IL6jjn2pl6FsODmpUEw+EWqysOneJwO81HjJLAxE5pfptj2m +lzWJcyrnv4VYqKYDoKZSG6O+B5Pz7Gunlh2IwUu+EgufWIZDsRahA9IrUonwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0f2d88d1ebbba796adb0492781b683cbfe25bd2d commit 0f2d88d1ebbba796adb0492781b683cbfe25bd2d Author: Konstantin Belousov AuthorDate: 2021-12-06 23:11:10 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-07 00:10:48 +0000 amd64: Only build aout.ko when COMPAT_FREEBSD32 is enabled a.out.ko is useless without COMPAT_FREEBSD32, and since vdso support was added, it requires a header built during depend phase, from the COMPAT option. Reported by: glebius Reviewed by: emaste, markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33311 --- 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 bb25c7277d85..087beb73f9ae 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 6e70513dfdf9..0daf5a54938b 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -93,6 +93,8 @@ CFLAGS+= -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} ${ASM_CFLAGS.${.IMPSRC:T}} +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+= -DSAN_NEEDS_INTERCEPTORS -DSAN_INTERCEPTOR_PREFIX=kasan \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 5fd6625bfb05..150fd405dc47 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -623,7 +623,9 @@ _neta= neta .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _agp= agp +.if ${MACHINE_CPUARCH} == "i386" || !empty(COMPAT_FREEBSD32_ENABLED) _aout= aout +.endif _bios= bios .if ${MK_SOURCELESS_UCODE} != "no" _bxe= bxe