From nobody Mon Jun 13 17:36:04 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 40C7A834F11; Mon, 13 Jun 2022 17:36:05 +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 4LMJdK005mz4tYb; Mon, 13 Jun 2022 17:36:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141765; 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=W+damEhBLt9Qma81VNWJhdn3TYm2gRVdy1HORleuFhY=; b=STqsa66sx1qsWTKlcrlP/lKKMc2cXMYVsan+UhBVW0wZcWAI5xcJt6Pm1zH2CfuEQQl796 5eERdZqS2/lsiTiYtcKFpXz6lD4NYhEtxBSs0Pej4uuXOKOzFBwmSj+iXjk4h8ZpzvgmLj F+KK8/f4fRNVlioQQBpi2IxsvG6jGjaB53UJByauzUKLRpx/GZO1UI/2dpNpnXkoXdYzvj uTlgqIEsQSg/iiW/w0qHpYsBEC/urJsH/le1fECKzJt/nTcrz+Wlot7x1stYsH+c9ymeUj Ul/z3mepeZc8Pvfqs2NS1BF1Af/ZtlQpevyubZtyi3oPsNDj7UV6lXBK+JFhmw== 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 710441A323; Mon, 13 Jun 2022 17:36:04 +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 25DHa497061322; Mon, 13 Jun 2022 17:36:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa4lf061321; Mon, 13 Jun 2022 17:36:04 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:04 GMT Message-Id: <202206131736.25DHa4lf061321@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: c2c8157ebed7 - main - amd64: -m32 support for machine/segments.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: c2c8157ebed76ee174b052a82b422e60b2d49b62 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141765; 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=W+damEhBLt9Qma81VNWJhdn3TYm2gRVdy1HORleuFhY=; b=upN1IW+H8ag5wcA2gv2XmXMqnLzDjHHYgsJk99dOfemwh6IR7Ew8tLDUXMtgaL5rTvgqAT LUFsIzZpvr2RipSVAWK+TaXHPr33l5B4m49DGeakMjkvpq5D5BNGw86LD1DyckSf94w/Lk nwuuXhnXufiXF7ufecMt/JWMS1+EEaaayLnwGoJmByQM1MuZ5Ku/XwwniEHmrBJIH7Letu x0ZiGqKv1FxtFzsQB03QlN08czbLijOCO9N5WYpmGbksakFH3pbapdBqhikqRuAeUlwgMD woKktexfeQrCMSC6YtTBUOjXTLuVuFH6DmymfYr/1aU5AAM4yFr5Km2I2R7bCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141765; a=rsa-sha256; cv=none; b=FCrFQPTjK26566v3zUkP6J1apuWLplL4VKpf5lR5ZAfX8gVEhqamaXcHzwlo0PftJu1yVe Xsy6lGBvZpJkZeqPUtey1PzZ3fbdMk7oW34Wf9sYSzfZo/RWtbSjQePiOisC5z1BKRnJpa ynSXJCwlcvd/+I7Zs9zZQx4bbgkbfusqb3XVdRACOP9o7fIHG+VADfi6YRbndXtQpyVN9o 00MyD8Ze/TIL2D65TNVndFc6/pS/fQqc54R2wzC5aI5ZrDpRIlVn1FwCq0GWQntxf0W9a5 O/AW/k/JCBOqlo2OSoi12iXPxlQ1N/HHXRFUijRKWT9OJZZ4CnL+VxdSZwFyEw== 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=c2c8157ebed76ee174b052a82b422e60b2d49b62 commit c2c8157ebed76ee174b052a82b422e60b2d49b62 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/segments.h Install the i386 segments.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 3 ++- sys/amd64/include/segments.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/i386/Makefile b/include/i386/Makefile index 40f272e3b8f9..e7eb0dd0c2eb 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -6,7 +6,8 @@ INCS= \ asmacros.h \ atomic.h \ cpufunc.h \ - profile.h + profile.h \ + segments.h INCSDIR= ${INCLUDEDIR}/i386 .include diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index a5fd89fbf6ce..1a04774e9868 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -36,6 +36,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_SEGMENTS_H_ #define _MACHINE_SEGMENTS_H_ @@ -105,3 +109,5 @@ void update_gdt_fsbase(struct thread *td, uint32_t base); #endif /* _KERNEL */ #endif /* !_MACHINE_SEGMENTS_H_ */ + +#endif /* __i386__ */