Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 13 Jun 2022 17:36:06 GMT
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: b3120c0aeba7 - main - amd64: -m32 support for machine/proc.h
Message-ID:  <202206131736.25DHa6pa061375@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks:

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

commit b3120c0aeba73edf0d42718802e221062d097dd1
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/proc.h
    
    Install the i386 proc.h under /usr/include/i386 on amd64 and include
    when targeting i386.
    
    Reviewed by:    jhb, imp
---
 include/i386/Makefile    | 1 +
 sys/amd64/include/proc.h | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/include/i386/Makefile b/include/i386/Makefile
index 9f6ab9b47766..9b31431549b7 100644
--- a/include/i386/Makefile
+++ b/include/i386/Makefile
@@ -7,6 +7,7 @@ INCS=	\
 	atomic.h \
 	cpufunc.h \
 	pmap.h \
+	proc.h \
 	profile.h \
 	segments.h
 INCSDIR=	${INCLUDEDIR}/i386
diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h
index 763f2a293e90..6181df35261e 100644
--- a/sys/amd64/include/proc.h
+++ b/sys/amd64/include/proc.h
@@ -32,6 +32,10 @@
  * $FreeBSD$
  */
 
+#ifdef __i386__
+#include <i386/proc.h>
+#else /* !__i386__ */
+
 #ifndef _MACHINE_PROC_H_
 #define	_MACHINE_PROC_H_
 
@@ -117,3 +121,5 @@ extern int max_ldt_segment;
 #endif  /* _KERNEL */
 
 #endif /* !_MACHINE_PROC_H_ */
+
+#endif /* __i386__ */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206131736.25DHa6pa061375>