From nobody Mon Jun 13 17:36:03 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 EB64B834D99; 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 4LMJdH45bmz4tMg; Mon, 13 Jun 2022 17:36:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141763; 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=1m56VBYAoJxIWQuwK/aCYQFnL09P5/Itu+ydCqYi3fM=; b=XEf32nuqGgPQhR+Rfib3kk9oMOP34aN2T/eFHgYNE70JxA3ffb6UNCzUUKbw/c3W2tpt+y 1iguUjXdVQJkTHpriveelPr2n+lzkFRRZOij9MKD7AwltAdzkOSLV2nraxJzEzKhHIsFOq iVMlQqATNDQGMaasFPYYtzQlmoTLEOOyQuHzVz7xhIODJhT9SXC6IFK8EWS40eEypCuq8B 4shHIhFkURG2+1CAJAgDpiJsFn/yFhSsm3viN2G9lJBvLHCuqvvoHHQf/7MgHVpwM/LNfR iGIQf64zPmP25KNbattAMEWSpDzDzuXACAvjBznG7pUrxUfPq30fNwY51Sxhkw== 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 4F71B1A137; Mon, 13 Jun 2022 17:36:03 +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 25DHa3lw061298; Mon, 13 Jun 2022 17:36:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DHa3D2061297; Mon, 13 Jun 2022 17:36:03 GMT (envelope-from git) Date: Mon, 13 Jun 2022 17:36:03 GMT Message-Id: <202206131736.25DHa3D2061297@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: 08f16287a540 - main - amd64: -m32 support for machine/atomic.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: 08f16287a540896fbf14ed7c28c9ec99819a8df5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655141763; 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=1m56VBYAoJxIWQuwK/aCYQFnL09P5/Itu+ydCqYi3fM=; b=iAjEtn/YWgX+S4Ug/uEe3qlNRqUCyiFQqoiggZp6XgjcuzpmGY0zdCWhN+Jb+s8fhTd6Lc XrN6pPtUK1zcmAHYzUnXmwOPVNY9MRVC8AdUEBUtHFGYRNAUr9s/zD40rGu5aWLxP8G2Fe xWzHMWjrFoPiieBO6dYVOo6PFmZtgJPPK70Td/KwB5sa8TzsPPh36nUa0NGnHu4AaQdiYq NbDulq0jgFiY0vy9lwllAD27Ip9TZvBlsG/xsnq5ryxu6676pTGmDgUutZEtjYVROl6QCq 8Ro9UP3OJwd1xvGuKbpyWaNJdWjIhjlNQTgmY8kQaeVFPLBeV1Cn1WF8ww+cAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655141763; a=rsa-sha256; cv=none; b=J1Phli2ABjlK3ktP5XAWIIqe3oFbPAOOl0MJc235je0ADKX1wZGCfjYIfA9FWBOtRTHJHc 9yDlqIjGEVpITXZ7ah/GYDicLoVdAj1v/HhLQBVWBVCAzhmTR5FdyCql3/P43TlRGwrCGP DHVcd5INPkeKCk7bHGWpo+/XIszg7vFfJ0sw/Eg8OtioMJapD00rInCH3WPPdFWXpEIx7b yuZQ/35Xnn6xbVXUdDcyKX6xAUHsZYAnQMG4tG5DRB7PfhwJC3qCyboCHZ2PnypjKB8qt/ IFj433soHy93DXHK6dVbP69++dnW9a5MiTX9o0nWQnlUNUzBzXWBY8jNRgiWhQ== 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=08f16287a540896fbf14ed7c28c9ec99819a8df5 commit 08f16287a540896fbf14ed7c28c9ec99819a8df5 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/atomic.h Install the i386 atomic.h under /usr/include/i386 on amd64 and include when targeting i386. Reviewed by: jhb, imp --- include/i386/Makefile | 1 + sys/amd64/include/atomic.h | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/include/i386/Makefile b/include/i386/Makefile index 6870657b6bfa..40f272e3b8f9 100644 --- a/include/i386/Makefile +++ b/include/i386/Makefile @@ -4,6 +4,7 @@ INCS= \ asm.h \ asmacros.h \ + atomic.h \ cpufunc.h \ profile.h INCSDIR= ${INCLUDEDIR}/i386 diff --git a/sys/amd64/include/atomic.h b/sys/amd64/include/atomic.h index 159d807f777c..6f188b167b95 100644 --- a/sys/amd64/include/atomic.h +++ b/sys/amd64/include/atomic.h @@ -27,6 +27,11 @@ * * $FreeBSD$ */ + +#ifdef __i386__ +#include +#else /* !__i386__ */ + #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -592,3 +597,5 @@ atomic_swap_long(volatile u_long *p, u_long v) #endif /* !SAN_NEEDS_INTERCEPTORS || SAN_RUNTIME */ #endif /* !_MACHINE_ATOMIC_H_ */ + +#endif /* __i386__ */