3b07952073
Fixes:
In file included from lnx_init.c:33:
../../../../hw/xfree86/common/compiler.h:767:10: fatal error: sys/io.h: No such file or directory
#include <sys/io.h>
^~~~~~~~~~
compilation terminated.
The ARM sys/io.h has been removed from upstream glibc, which is in
buildroot. This causes the xorg-server build to fail on ARM when using
the glibc toolchain. See [1], [2].
The following patches ([3], [4]) from upstream xserver fix this, but
have not yet been released.
[1] https://sourceware.org/glibc/wiki/Release/2.30#A.3Csys.2BAC8-io.h.3E_removed_on_32-bit_Arm
[2] https://gitlab.freedesktop.org/xorg/xserver/issues/840
[3] 6a2ce6c5da
[4] fe4cd0e7f5
Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
Reviewed-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 6a2ce6c5da9456b97683db6224f38ef3b02cce4b Mon Sep 17 00:00:00 2001
|
|
From: Ross Burton <ross.burton@intel.com>
|
|
Date: Thu, 20 Sep 2018 13:21:34 +0100
|
|
Subject: [PATCH] compiler.h: only use inx/outx on ARM with glibc
|
|
|
|
musl only implements inx/outx on x86, so check for __GLIBC__ instead of
|
|
__linux__.
|
|
|
|
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
[Upstream: https://gitlab.freedesktop.org/xorg/xserver/commit/6a2ce6c5da9456b97683db6224f38ef3b02cce4b.patch]
|
|
Signed-off-by: Thomas Preston <thomas.preston@codethink.co.uk>
|
|
---
|
|
hw/xfree86/common/compiler.h | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
|
|
index 7144c6a27..fb53ced80 100644
|
|
--- a/hw/xfree86/common/compiler.h
|
|
+++ b/hw/xfree86/common/compiler.h
|
|
@@ -758,9 +758,9 @@ inl(unsigned short port)
|
|
return xf86ReadMmio32Le((void *) ioBase, port);
|
|
}
|
|
|
|
-#elif defined(__arm__) && defined(__linux__)
|
|
+#elif defined(__arm__) && defined(__GLIBC__)
|
|
|
|
-/* for Linux on ARM, we use the LIBC inx/outx routines */
|
|
+/* for glibc on ARM, we use the LIBC inx/outx routines */
|
|
/* note that the appropriate setup via "ioperm" needs to be done */
|
|
/* *before* any inx/outx is done. */
|
|
|
|
--
|
|
2.23.0
|
|
|