From nobody Mon Jun 13 17:36:06 2022 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 A80CB834EE8; Mon, 13 Jun 2022 17:36:07 +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 4LMJdM38trz4tmB; Mon, 13 Jun 2022 17:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141767; 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=Klv/vLqUc/MbLhXTxMFpzK25A5ZjGrOMuOmH9/yMNWE=; b=izEKrFu3MgN4gs5VvYMHYBMRCMJ5I9KBKM2RG8JwLXRFwnmUq6U9cpwz4ER1HOf7l+oOvv KTP5F3L4Iqi8qImhlUi3QcbiQCBgTUrpXUidyhKguKlABqyvd14p5Tf6aAycWGzaVqbECa D552pLocJMsEZ0ddRxOzruetIal5ACcNjGxQmDfxZJ3o+PvMTOHT++prj03pGGHhp9ep4Y /2HUCNp/FTsrTLx74BShVi22HkxRLdpoc+iz8kfN0AuJei2E/80HuJ7X/J3WHc6VFi0UQC Y32JmBWdTVc7dfzrvCfcKGpeGBYelPlHeMKz+rUWwfjgEI05UxQ4zcwFA+XRBw== 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 B78BC1A1F4; Mon, 13 Jun 2022 17:36:06 +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 25DHa6fD061376; Mon, 13 Jun 2022 17:36:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa6pa061375; Mon, 13 Jun 2022 17:36:06 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:06 GMT Message-Id: <202206131736.25DHa6pa061375@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: b3120c0aeba7 - main - amd64: -m32 support for machine/proc.h 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3120c0aeba73edf0d42718802e221062d097dd1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141767; 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=Klv/vLqUc/MbLhXTxMFpzK25A5ZjGrOMuOmH9/yMNWE=; b=lU9l53SonhE8tcGCVoeushkRljN2A5+IqYRzMqyLohDAK5fiyf+aw5iisQztxj/yDZNFsu y2cuDsDrNHzhHI+oqdvAhBWY4bXcTPzJUoB+iaRgyNGEgKpCzR/s3tXzKBz2SMxlbqdAmw ZnkFFzbRClrQlyzgyeaahrqtFMoUdGXn1s+R7oDu5Uk/vazFzqFeTvNjR0kft+dV41XGRq WXmRSxG8eI2nXi1Su98iOItzh5rTiBTXBPsJrp5yyeyk+Hhu7oykoUY3ExX/OC8FPraQVH Nw5cs+nFZ78kp38RFNkDwebkxQc0dF4jDzRnRKzsSedxLlt+Z2gpJHPji68LqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141767; a=rsa-sha256; cv=none; b=oP4LdoSVXbDs4DD2mDgnXSqESksTZqPyqLkkgELH/NRoYgmdzbAanJOW/U32fwkIncHj+u PweG1kmE0O4tr3201uWU2+ga7jN6rfRw1NX2svuKnkGIUR2/BMuMSv1MypBYp95Hbome3S l2hcUhp392djWGK/5c50uazLdHJH82SwbexiDXzdB6RIvGVqCSg4E1l60wrwWpHHvUrEIB SmdDzGdIrsPfwRZZ0/2Bj5fJW9If0I7G/qkLnkFMSqktlbfEeuzMomtwlFO7SlLnF0iSPY ERcauUHx1fo0PsOBk20jdo13j4vGPeqxLhmUGOgumVkwkR6wzET6xlxXFBDd4w== 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=b3120c0aeba73edf0d42718802e221062d097dd1 commit b3120c0aeba73edf0d42718802e221062d097dd1 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/proc.h Install the i386 proc.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 1 + sys/amd64/include/proc.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index 9f6ab9b47766..9b31431549b7 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -7,6 +7,7 @@ INCS= \ atomic.h \ cpufunc.h \ pmap.h \ + proc.h \ profile.h \ segments.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h index 763f2a293e90..6181df35261e 100644 --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -32,6 +32,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_PROC_H_ #define _MACHINE_PROC_H_ @@ -117,3 +121,5 @@ extern int max_ldt_segment; #endif /* _KERNEL */ #endif /* !_MACHINE_PROC_H_ */ + +#endif /* __i386__ */