summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch63
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch18
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb4
3 files changed, 65 insertions, 20 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
new file mode 100644
index 0000000000..da9a4f2b25
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch
@@ -0,0 +1,63 @@
1From 2ba9510721b7a76cb7fe507449fa0ac997a4cce3 Mon Sep 17 00:00:00 2001
2From: Olivier Fourdan <ofourdan@redhat.com>
3Date: Mon, 1 Jul 2019 13:20:39 +0200
4Subject: [PATCH] compiler.h: Do not include sys/io.h on ARM with glibc
5
6<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
7it from glibc upstream.
8
9Remove the include to avoid a compilation failure on ARM with glibc.
10
11Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
12Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/commit/fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba]
16---
17 hw/xfree86/common/compiler.h | 30 ------------------------------
18 1 file changed, 30 deletions(-)
19
20diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
21index 7144c6a..2b2008b 100644
22--- a/hw/xfree86/common/compiler.h
23+++ b/hw/xfree86/common/compiler.h
24@@ -758,36 +758,6 @@ inl(unsigned short port)
25 return xf86ReadMmio32Le((void *) ioBase, port);
26 }
27
28-#elif defined(__arm__) && defined(__linux__)
29-
30-/* for Linux on ARM, we use the LIBC inx/outx routines */
31-/* note that the appropriate setup via "ioperm" needs to be done */
32-/* *before* any inx/outx is done. */
33-
34-#include <sys/io.h>
35-
36-static __inline__ void
37-xf_outb(unsigned short port, unsigned char val)
38-{
39- outb(val, port);
40-}
41-
42-static __inline__ void
43-xf_outw(unsigned short port, unsigned short val)
44-{
45- outw(val, port);
46-}
47-
48-static __inline__ void
49-xf_outl(unsigned short port, unsigned int val)
50-{
51- outl(val, port);
52-}
53-
54-#define outb xf_outb
55-#define outw xf_outw
56-#define outl xf_outl
57-
58 #elif defined(__nds32__)
59
60 /*
61--
622.22.0
63
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
deleted file mode 100644
index 4be441fb71..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch
+++ /dev/null
@@ -1,18 +0,0 @@
1inb/outb family for arm is only implemented on glibc
2so assumption across linux is wrong
3
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5Upstream-Status: Pending
6Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h
7===================================================================
8--- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h
9+++ xorg-server-1.18.0/hw/xfree86/common/compiler.h
10@@ -758,7 +758,7 @@ inl(unsigned short port)
11 return xf86ReadMmio32Le((void *) ioBase, port);
12 }
13
14-#elif defined(__arm__) && defined(__linux__)
15+#elif defined(__arm__) && defined(__GLIBC__)
16
17 /* for Linux on ARM, we use the LIBC inx/outx routines */
18 /* note that the appropriate setup via "ioperm" needs to be done */
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
index ad99d6bece..d7c5e6b355 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb
@@ -1,9 +1,9 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2 2
3SRC_URI += "file://musl-arm-inb-outb.patch \ 3SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
4 file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \
5 file://pkgconfig.patch \ 4 file://pkgconfig.patch \
6 file://0001-test-xtest-Initialize-array-with-braces.patch \ 5 file://0001-test-xtest-Initialize-array-with-braces.patch \
6 file://0001-compiler.h-Do-not-include-sys-io.h-on-ARM-with-glibc.patch \
7 " 7 "
8SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" 8SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650"
9SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" 9SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee"