aboutsummaryrefslogtreecommitdiff
path: root/sys/arm64/include/_align.h
diff options
context:
space:
mode:
authorMike Karels <karels@FreeBSD.org>2023-07-25 23:59:26 +0000
committerMike Karels <karels@FreeBSD.org>2023-07-25 23:59:26 +0000
commitd5d97bed4ab6bb63e97c8ff67b5b94ae37cd24fc (patch)
tree85e3dccc7d4d6719c866996135a58b5e238ba2da /sys/arm64/include/_align.h
parentf1d5183124d3e18d410ded61e45adb9a23b23c83 (diff)
arm64 lib32: prepare arm64 headers to redirect to arm
In order to compile lib32 libraries and other 32-bit code on arm64, <machine/foo.h> needs to be redirected to an arm header rather than arm64 when building with -m32. Ifdef the arm64 headers that are installed in /usr/include/machine and used by user-level software (including references from /usr/include/*.h) so that if __arm__ is defined when including the arm64 version, <arm/foo.h> is included rather than using the rest of the file's contents. Some arm headers had no arm64 equivalent; headers were added just to do the redirection. These files use #error if __arm__ is not defined to guard against confusion. Also add an include/arm Makefile, and modify Makefiles as needed to install everything, including the arm files in /usr/include/arm. fenv.h comes from lib/msun/arm/fenv.h. The new arm64 headers are: acle-compat.h cpuinfo.h sysreg.h Reviewed by: jrtc27, imp Differential Revision: https://reviews.freebsd.org/D40944
Diffstat (limited to 'sys/arm64/include/_align.h')
-rw-r--r--sys/arm64/include/_align.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sys/arm64/include/_align.h b/sys/arm64/include/_align.h
index 3844133ffb68..5c153779aca3 100644
--- a/sys/arm64/include/_align.h
+++ b/sys/arm64/include/_align.h
@@ -30,6 +30,10 @@
* $FreeBSD$
*/
+#ifdef __arm__
+#include <arm/_align.h>
+#else /* !__arm__ */
+
#ifndef _MACHINE__ALIGN_H_
#define _MACHINE__ALIGN_H_
@@ -42,3 +46,5 @@
#define _ALIGN(p) (((u_long)(p) + _ALIGNBYTES) & ~_ALIGNBYTES)
#endif /* !_MACHINE__ALIGN_H_ */
+
+#endif /* !__arm__ */