From nobody Mon Jun 13 17:36:02 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 1C38C834C49; Mon, 13 Jun 2022 17:36:03 +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 4LMJdG3c3Jz4tMX; Mon, 13 Jun 2022 17:36:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141762; 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=bG3OMsH++SofwaBEClxxVNdkv5VY6Dy01EAEF11c2tU=; b=iSpBer/PcdWMiWF/PtjflhXZ1RsXjrzpOxtLfO+IAzLaWx+WwmoEly/2PxlU4gy3yRVC/S h62XcyChe/yTzfN39Rf1B7LMdQuuYTsyCnmVxSVQI0CpErv7pUamIcpiuXRf5ZirXLWxQt rgr/1WK7Ab0VeFvk0AVtg75/JkyPPmabj0xE5cZoYqJmABSP8Td0/kHfTH2erS0DrDQ5LO j4RTN7LtZ3JnpRRfbC1P0214x9NzKGYo6g3yPEqxiPaEl/RKPd0e4YdacITOWKrlpQXmAo HMk+hyw0pflKTEVYQCTtlOjgkzHHkugZhFh3pdzWg3mdUYGbmrfqAxJgujMfGw== 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 2BA821A136; Mon, 13 Jun 2022 17:36:02 +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 25DHa2Eg061274; Mon, 13 Jun 2022 17:36:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa2Nc061273; Mon, 13 Jun 2022 17:36:02 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:02 GMT Message-Id: <202206131736.25DHa2Nc061273@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: 92a98611ca20 - main - amd64: -m32 support for machine/asm(macros).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: 92a98611ca2019c1cbc432617c130355108890cd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141762; 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=bG3OMsH++SofwaBEClxxVNdkv5VY6Dy01EAEF11c2tU=; b=qtPOkmygiQrqKQZDkU6WvGmfc2dM4oyDsbfz7jMPh5mm1MZO9y7fl+qQew4KIQJJT8xUnP e0QHDUbZ7xiRb4ffiYvXMCrMF9T0seyYmjGqyIu8+5NWyporvuZotzYo21Lh4ANqfbiezz Udd7DQKezPuKxsi63Po7f/6fDDVaXByUlZZXoyxIo8PuiFvmBJ6COKyq7DlH3xPzq1BdQv wa81TasFhb/MIW0gNpVqzYFgajHgXdcIC+YJDuLj2nimX0K5t415awJXLIog4ojwIFSbLu 3H6A8rQDS2vINiEtvIXgTYdLb+G3UvXY7IKwNT7AzDCyKn2qvSoRcHWi/Zg8tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141762; a=rsa-sha256; cv=none; b=JldFj5tT1v5gEXvlngGNG2EzlN20ioYYBQzXYfQnpexCvFCAZ6BqHTXi6J1NYED4qnBuDp YvHlHwWjnY1wES8vnfs6bQJdcJuKqAhNLOG0hXfhVQaeCzDsDJpnVU8yPX3b5awi/lhJaD Wh2IUfLnvzkySVi0uYDTra/IHD127Q7YWWPuGIXAjSGqy7HEi0B+pNw0lKzSzRTya/kqYF dH+XKtIdq3fpXuhif0RA4uMfiv4mCsY7WHohZuX8GnD3IxkZRu12zwKXArgoN93Y7p52Eu GRFwueIlCrvt7WOOrJTrcKReHaDs47MVd8KoGozTndhxn0GYl8bwuLExA0VQXw== 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=92a98611ca2019c1cbc432617c130355108890cd commit 92a98611ca2019c1cbc432617c130355108890cd 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/asm(macros).h Install the i386 versions under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 2 ++ sys/amd64/include/asm.h | 6 ++++++ sys/amd64/include/asmacros.h | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index e422a100bebd..6870657b6bfa 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -2,6 +2,8 @@ .PATH: ${SRCTOP}/sys/i386/include INCS= \ + asm.h \ + asmacros.h \ cpufunc.h \ profile.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 7b66e9446ff3..a0f886443e52 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -35,6 +35,10 @@ * $FreeBSD$ */ +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ @@ -110,3 +114,5 @@ #endif /* !STRIP_FBSDID */ #endif /* !_MACHINE_ASM_H_ */ + +#endif /* __i386__ */ diff --git a/sys/amd64/include/asmacros.h b/sys/amd64/include/asmacros.h index 973a1c761c6b..a0d2e153f09b 100644 --- a/sys/amd64/include/asmacros.h +++ b/sys/amd64/include/asmacros.h @@ -39,6 +39,10 @@ * $FreeBSD$ */ +#if defined(__i386__) +#include +#else /* !__i386__ */ + #ifndef _MACHINE_ASMACROS_H_ #define _MACHINE_ASMACROS_H_ @@ -264,3 +268,5 @@ X\vec_name: #endif /* __STDC__ */ #endif /* !_MACHINE_ASMACROS_H_ */ + +#endif /* __i386__ */