git: 3cd1b382c664 - main - amd64: -m32 support for machine/pmap.h

From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 13 Jun 2022 17:36:05 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=3cd1b382c6641f7e04e243dec46ee71744c7630e

commit 3cd1b382c6641f7e04e243dec46ee71744c7630e
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2022-06-13 17:35:39 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2022-06-13 17:35:39 +0000

    amd64: -m32 support for machine/pmap.h
    
    Install the i386 pmap.h under /usr/include/i386 on amd64 and include
    when targeting i386.
    
    Reviewed by:    jhb, imp
---
 include/i386/Makefile    | 1 +
 sys/amd64/include/pmap.h | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/include/i386/Makefile b/include/i386/Makefile
index e7eb0dd0c2eb..9f6ab9b47766 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -6,6 +6,7 @@ INCS=	\
 	asmacros.h \
 	atomic.h \
 	cpufunc.h \
+	pmap.h \
 	profile.h \
 	segments.h
 INCSDIR=	${INCLUDEDIR}/i386
diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h
index 318e70e7794c..9aacae73ebd4 100644
--- a/sys/amd64/include/pmap.h
+++ b/sys/amd64/include/pmap.h
@@ -44,6 +44,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/pmap.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_PMAP_H_
 #define	_MACHINE_PMAP_H_
 
@@ -584,3 +588,5 @@ pmap_pml5e_index(vm_offset_t va)
 #endif /* !LOCORE */
 
 #endif /* !_MACHINE_PMAP_H_ */
+
+#endif /* __i386__ */