From nobody Mon Jun 13 17:35:59 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 6BF97834ACE; Mon, 13 Jun 2022 17:36:00 +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 4LMJdD0kq6z4tGg; Mon, 13 Jun 2022 17:36:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141760; 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=v16W2SfXYVQg1V7qKGKKlHzPOO0TxMjsdiNZKdbdWKg=; b=eRBMMsQ7MKpUqVt5FPpXR2WLF4AYB954EQJyHG4+N4UrMGxI0TfiV3kQQRvrs7yYTKnu+X gqOO/QAhLECOu8AZ5CJN+Fyr3JMJO4HNLkGsHnABU75OkPIqWUGQGBV3qo1ep5mIu7Auxx hBZoytn0jeBwoMsp8WmRowQN+eJO4JDSQOlmi85ekdTFn6TJUH4iY7rqR9cwtXPu56msH/ Uvuhvw7oLnD3QUtQ+9ruBRqgpERxS2EWSWy6MNODzrJwLaVblmzY91PUpB64BRxUWhrJ+g r/4nz1vRgHP3OwazqCH+GpilPQrhWiy8rdb03mhZczcR7zm5tA73OPvXgLWLWA== 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 DE0BB1A390; Mon, 13 Jun 2022 17:35:59 +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 25DHZxHC061223; Mon, 13 Jun 2022 17:35:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHZx8i061222; Mon, 13 Jun 2022 17:35:59 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:35:59 GMT Message-Id: <202206131735.25DHZx8i061222@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: cca19272611d - main - amd64: -m32 support for machine/cpufunc.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: cca19272611dac7ac1ac3ae4c457ce5cb6c38cff Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141760; 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=v16W2SfXYVQg1V7qKGKKlHzPOO0TxMjsdiNZKdbdWKg=; b=ZMpIX7ZtU1zWFr7mEKiTpPqrytTKSVZ6u5GeoWmQzsGrcSsZzH7DDo5ybTQaCt8R8kJ5hj XafQMZHIeSbqU3PrytcRd8CHFttPO724A+RaL/mNLVqGf/fB8DO5Oj0ohgKYObDvu3yV9B tL8QVLAOUw8kYlzP+uT0K37K/XFBHSUKFNkWYj57nr0/NVuKEdnOrD2h7MRpNpvUYATjwn alNiFB+/Mph7sjIkYLtQsT1GcQmH2A0oDqQ+8m+1dWMpPtTfaQIMHXcorbKC5a4fEPiREQ ruXo11fxar9BUBPQs+mLTVx6Sa+0k6kdGHJj0MbmupjQQE58n+D6wn6TexUeuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141760; a=rsa-sha256; cv=none; b=bQY8+kmKHvMlcVGDt1zDW83qRBV9UYrrYpRQ/mSL4EG3xn507JH1XrdYIpAVGGFp/xbZB6 g6a9M/xHMPUtO1gR1Ud3Q15VTXBelisDZbKo3eQNkssIfOteaHWwE/uUNYiGcQ4HSAb5Gq mNEKIbU4ohoxw/h28gkMM8QKT5oaKdEE8eXGelF3DqVZ1dTXDS+t7JdhquL7YIKCGEqLCY nWzT8aetR1ZRmIwnb3SuLLH5F6oLhxWQkeFPDrrnwQgGa+1LIxJzxiAO0lZ+6RQ2yfTg+X ChLqUyvjsfQKwzWeGulsaNFMUsHBGIoCuDjWMOHu5VIerne2F+EzhVt9Jb18zQ== 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=cca19272611dac7ac1ac3ae4c457ce5cb6c38cff commit cca19272611dac7ac1ac3ae4c457ce5cb6c38cff Author: Brooks Davis AuthorDate: 2022-06-13 17:35:38 +0000 Commit: Brooks Davis CommitDate: 2022-06-13 17:35:38 +0000 amd64: -m32 support for machine/cpufunc.h Install the i386 cpufunc.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 3 ++- sys/amd64/include/cpufunc.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/i386/Makefile b/include/i386/Makefile index 60f70d4756b2..9bf2cef50b78 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -1,7 +1,8 @@ # i386 headers installed on amd64 .PATH: ${SRCTOP}/sys/i386/include -INCS= +INCS= \ + cpufunc.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 941c951a941a..09f63b865948 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -38,6 +38,10 @@ * used in preference to this. */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_CPUFUNC_H_ #define _MACHINE_CPUFUNC_H_ @@ -966,3 +970,5 @@ int wrmsr_safe(u_int msr, uint64_t newval); #endif #endif /* !_MACHINE_CPUFUNC_H_ */ + +#endif /* __i386__ */