From nobody Sun Jul 9 17:52:08 2023 X-Original-To: dev-commits-src-main@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 4QzZTf6XfDz4mW1Z; Sun, 9 Jul 2023 17:52:10 +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 4QzZTP1N3fz3v9y; Sun, 9 Jul 2023 17:52:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925129; 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=OviadEwt0Enl281sNYnh/mI1+9Qn9hYlrA3RQBNcAJA=; b=McNBaidOq/lA5lyG4Yc83tPbMeDWyvoy8kavf8/dyfSpr/Tky4giS+CIBqjeWfOyJKhL2D lVYhMyi0JyXyPS3YjwIRaZ6zb3fLh3lGIS2lSbNv/nYxBbJPrdnl9mCsbALNb3R99NfdLp XFZVuHzI7rem5OqUuqOBeAbSxA6R2DGnRf6YUBsSxdW2YRS66KZIOzgtVTCiH5g0wutSJy HCbQ4yOq9Fb6ObiP5nBkStparWWWCJMcG4ddMBEqSooKq9XH3hGtSrAq/r5ymkVqtcLs79 NbWGzcEebxKmvJaTxhBDcFF3c+R3ZL9LRAygJfuLVA+7PRPEzZ6DaxsFZ1cJNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688925129; 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=OviadEwt0Enl281sNYnh/mI1+9Qn9hYlrA3RQBNcAJA=; b=JdKq7M0Q0h5v3GnzX+XAu9XlWYsbsAM5B10wtxAbNrboy7Ec/HoCXwD8EaVwhZbCIT9Nsx QBJjA98blJF+QNCak3OAproI1tkHlTqJOcyBMvgJ6Z4OcGjSRNaJshBw4xaZ9urEhm3Xa3 QTEwGu6vHxzLv6vu7kH6NXuyyYAwbgn5OlBcF6IKQdtrvnDht1fLT3+vMJL33Vjbt+cdWP a4jG0Vjd17g+b5PlmOGKHay4Il9+FjjSlh9hR0GEXF0PlU9cU2b08ZysIitUZaphLEwAJi YRItGdA4eJxT7mj1eY57KOTMXuooRKIZuTtNM73GRHtDrED8Yeuxet4FiUnwGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688925129; a=rsa-sha256; cv=none; b=SIi3x8YdNykWezZOeeVLJuslrbXgh+nxeYfgVljWz5o8e6J+9ue+bFfe9p15GO+70/yWpM jWNjWBeMuf8IdS1JLp2iyrC1KkqI6rHM4VaRo+0vrW4+S9Rr+yatBcMAs5N5uzm1lbHf4v 4/IUEXjwQnSV1ia/x8FdN8SBHVAclrFRXznk2fG6UMEDEKFeAC4HQfkczKwhU8jRo5jr8v K4LKpjVYK32E3+E+UZw/gww437lMDYQ3Zloza80oUf6hap7luWstBO3G1dwPgccNAaKy0A Up9PDUxoQ9fgbNaCPgvgMpZBhetZKOK6ywGBRakqk6L4WCbuGQ6gDiz/lIHfQA== 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 4QzZTN5ZYyz1BNm; Sun, 9 Jul 2023 17:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 369Hq8CY098786; Sun, 9 Jul 2023 17:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 369Hq8xK098785; Sun, 9 Jul 2023 17:52:08 GMT (envelope-from git) Date: Sun, 9 Jul 2023 17:52:08 GMT Message-Id: <202307091752.369Hq8xK098785@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 45be5010ce04 - main - libsysdecode: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45be5010ce04d254793ed97a1320249e347726b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=45be5010ce04d254793ed97a1320249e347726b0 commit 45be5010ce04d254793ed97a1320249e347726b0 Author: Jessica Clarke AuthorDate: 2023-07-09 17:49:43 +0000 Commit: Jessica Clarke CommitDate: 2023-07-09 17:49:43 +0000 libsysdecode: Migrate from COMPAT_32BIT to generic COMPAT_LIBCOMPAT The use isn't any more generic, just the variable itself, which will allow COMPAT_32BIT to be removed. The fact we even have to check COMPAT_LIBCOMPAT here in order to pass the right flags to CPP points at our libcompat infrastructure not suitably modifying the CPP variable (which we barely use for world; this and bsd.symver.mk are the two uses, and the latter could benefit from the right flags too), but this change doesn't attempt to fix that. See commit 8fad2cda93c7 ("bsd.compat.mk: Provide new CPP and sub-make variables") for the context behind this change. Reviewed by: emaste, imp, brooks, jhb Differential Revision: https://reviews.freebsd.org/D40930 --- lib/libsysdecode/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index 6fb32caebcb1..eb977c3564ac 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -112,7 +112,8 @@ MLINKS+=sysdecode_mask.3 sysdecode_accessmode.3 \ CLEANFILES= ioctl.c ioctl.c.tmp tables.h tables_linux.h -.if defined(COMPAT_32BIT) +# XXX: The flags should come from bsd.compat.mk / Makefile.libcompat +.if ${COMPAT_LIBCOMPAT:U} == "32" CPP+= -m32 .endif