From nobody Mon Jun 13 17:36:07 2022 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 22D0A834F76; Mon, 13 Jun 2022 17:36:09 +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 4LMJdN62bLz4tgW; Mon, 13 Jun 2022 17:36:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141768; 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=pPZzvpziX1x/JGv8pFaRGTKSjBzykbOtJ4d70rHvsm0=; b=uVcK/cFjd8xXnT1LyaLPrbS9WuTSH9c2k6B6bAbHwvanyCGj5aj7uvMTZ0ksOoVXVz2tzv 1dG6H4N98hykgegQEe/Ds0JYnaAKL0NJEe4HDVU+DyOXfUU3Qij2J2VQdVS9TxPKhbE85u vWJUP+MJfv+8Eulu1XAAiAjqjZlTXJhkt7o2C1hYYeXQwMyvr0LkXe0tGwFGUqnJSpcVx8 JdrPP90BgphRCY9DWmp2JE8yS8mnoVQAWJUSs86PTQ4xL7CgheQZhn1pl3P4/zLOV4wYKc lfX64hrs+dQdc7DI6UVccPcrBlyS44jxPpibQ8CT65aU04hLwFOErz2IF0bk/A== 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 DDE621A325; Mon, 13 Jun 2022 17:36:07 +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 25DHa7gH061400; Mon, 13 Jun 2022 17:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa7Jx061399; Mon, 13 Jun 2022 17:36:07 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:07 GMT Message-Id: <202206131736.25DHa7Jx061399@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: a69511db186e - main - amd64: -m32 support for machine/vmparam.h 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a69511db186e3576ab144be31539d3986cdc8a51 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141768; 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=pPZzvpziX1x/JGv8pFaRGTKSjBzykbOtJ4d70rHvsm0=; b=DzEjcQoI2OsmLlT0sVAU8LCDIuWiFS4uXbHcIBDHeqBx/F1BYvcMu+OOzMP5ZsE2dXAKtO 4DiRdtjV7o4xcHq1Qa9UIR3NgyjjBy/KlMLxAmCN6t4XbaxEBafe50HIltDyuUYhlRPBYp If0WXKW/0Aa+E9Q41PQNt+v13BkaX3CJJunXgchZUSoQVVzqAY0UCuNv8w06pdqnDY76fF M5kU9+JSKBdvQV36jeb1wr8xPY39mbby4/2oaYttIzeL131wMJoIG51nUTp1m7/e9tK1R4 p23nlQ5thofwVzdwbK+9r1+WoCQrmHaKaNu5Xuz5Is+xouYvZooEHJ7YkzGVqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141768; a=rsa-sha256; cv=none; b=uM4hit99TWuEeuQcA5qOkvBRk7dlM6SwDYPx8uiF3hQOXq6OHSxAfkA28V/OxuiBJvSpmy GpgKG8ELRJrqPX1nE5BI+nY+35EZEmmjlhK1B6vuzXGP7PCwIz1ymNxVeWqMqsXyNltBCx QsGSPAVTjqCw5lfE1bTd4W7FpKIPfaiQegV4CuwVU1AHGbq03I4TSZDu0sqeU6N5PXbCrC IXyJM5ctKQqERp/iKbB9rH8ScHnP3zaNirlGZxAVLqGDPfkJpsCVSOqmBM8MIMaRGuwUej nto6JTVTRjeSVaNIBBg/y5bS4LYck8scd+eMLeZMr2OwzYcb1iZTMmGkKOOCsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=a69511db186e3576ab144be31539d3986cdc8a51 commit a69511db186e3576ab144be31539d3986cdc8a51 Author: Brooks Davis AuthorDate: 2022-06-13 17:35:39 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:39 +0000 amd64: -m32 support for machine/vmparam.h Install the i386 vmparam.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 3 ++- sys/amd64/include/vmparam.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/i386/Makefile b/include/i386/Makefile index 9b31431549b7..5bc1a13033e5 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -9,7 +9,8 @@ INCS= \ pmap.h \ proc.h \ profile.h \ - segments.h + segments.h \ + vmparam.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index c841cc41f17b..fc88296f754c 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -43,6 +43,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_VMPARAM_H_ #define _MACHINE_VMPARAM_H_ 1 @@ -302,3 +306,5 @@ #define MINIDUMP_PAGE_TRACKING 1 #endif /* _MACHINE_VMPARAM_H_ */ + +#endif /* __i386__ */