From nobody Mon Jun 13 17:36:00 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 CC0CC8348FE; Mon, 13 Jun 2022 17:36:01 +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 4LMJdF2pYFz4tGl; Mon, 13 Jun 2022 17:36:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141761; 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=i10GlZ8MpeNLkyr6xVEv2cDsfxHU7exXO9O9xR55TH8=; b=mrfKK+UXdLSCH+qGdz7/64GWec67m2I1Z9RGau6mmq5nqGFmX6KO0ZizQGOX8mWNqcya/5 53apg1qGMd+2EiWDb/9O/cMCrvHf7am9laoSlrJ4jFddppH5n/ocI4OgCiM27YTRnjAdTp XS10hLzYaw4FrO2/6eqxvssM2LwG4Q6ZdkrR24BpxXM/h83ipAPpqkGPXw6ImCweYcdxwc LJ3fwP2hymc9XLLJ1/PumsW4/wCiZ3K2BR7J9SlGO5EPeQkNfauncAJ5m4YLusb6fWpsK/ H0R250iRhZQyGuyvwGLenPNYlZ2wiak6W/sbhDDUMIGLjfEmxyWU26DjpHGqlg== 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 0A9081A391; Mon, 13 Jun 2022 17:36:01 +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 25DHa0uL061250; Mon, 13 Jun 2022 17:36:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa074061249; Mon, 13 Jun 2022 17:36:00 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:00 GMT Message-Id: <202206131736.25DHa074061249@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: 68049f6da84a - main - amd64: -m32 support for machine/profile.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: 68049f6da84a620246b24c04da09db03564fa18c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141761; 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=i10GlZ8MpeNLkyr6xVEv2cDsfxHU7exXO9O9xR55TH8=; b=b6nYXYFdMoa66SNKRqWXiJkjmy7PT3g2VfjOM86l9BRas812dxMSXJTxeWV76Qt0hrn33+ C1+kErPLxnaLG7DOfoJWUOM/u/Dwb0SHCVuLDzFT9FSiTX4NyxrTwYtMpySsOvcmf7NCF3 LmgArZVtyqTfA0oiS2dv504x7liWF1fps52VbM+vQBQnVSt5ygugzBy1DPimAESOMG4lDu h1Sz+YJMn6eaEmfQdU7IFkp+akETvVPbEWTg+G/ZeSTpK8k689EhPwjsSIZPbEOdUP/2n5 teMbS+1ZPEyvs77iSih+XchH8xH6W2zxV7/efK6bQvGdhg62U+qWD3kw/KMNSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141761; a=rsa-sha256; cv=none; b=lR+TIgRoGVhioIVg4E+cg24ds83S8RLaELaCM/l8zTgHTt0BMat8/JpU/k9sOPB6ARK0aO cRVVlpjj2cz1w6qgKZAcODqSoXe8xQOh4ZlARaPfnx39Q6FBMkiCq/ErBKXM6NeeVC2Kdc CJEpWe62/pWk4lpD+FH0XhINqLFMajm9yjWFFRW16i4U4YsXLBBEeHLZHb3SHnCBUWmFrr oMtX/IxJTy9eQx5/dsNz69rrLGCiQEFCkgfO4D4lT9O6LTjRXnbVsBScUq8PSjk4tNx7Kk oQcDpp7l2aZhup9+1nwa8dIpdR5m0rFDv6/R6ewrRytHDTZYqAN041PwmJBT9Q== 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=68049f6da84a620246b24c04da09db03564fa18c commit 68049f6da84a620246b24c04da09db03564fa18c 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/profile.h Install the i386 profile.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 3 ++- sys/amd64/include/profile.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/i386/Makefile b/include/i386/Makefile index 9bf2cef50b78..e422a100bebd 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -2,7 +2,8 @@ .PATH: ${SRCTOP}/sys/i386/include INCS= \ - cpufunc.h + cpufunc.h \ + profile.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h index e86fd582b407..31b6379d4735 100644 --- a/sys/amd64/include/profile.h +++ b/sys/amd64/include/profile.h @@ -32,6 +32,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_PROFILE_H_ #define _MACHINE_PROFILE_H_ @@ -116,3 +120,5 @@ __END_DECLS #endif /* !_KERNEL */ #endif /* !_MACHINE_PROFILE_H_ */ + +#endif /* __i386__ */