diff options
| author | Olivier Fourdan <ofourdan@redhat.com> | 2019-07-01 13:20:39 +0200 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2019-11-17 21:22:46 -0800 |
| commit | 07efd81b819f21046afc0bb7e19a6cdf7f3c7ea9 (patch) | |
| tree | bb99fc3321dd49192e3544fa73498ad05de557d9 | |
| parent | 03b91e17ce72649b2d6946213f5a7d152bfe7098 (diff) | |
compiler.h: Do not include sys/io.h on ARM with glibc
<sys/io.h> on ARM hasn't worked for a long, long time, so it was removed
it from glibc upstream.
Remove the include to avoid a compilation failure on ARM with glibc.
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/840
(cherry picked from commit fe4cd0e7f5c58fa94db36326aadc1bd4e6d73eba)
| -rw-r--r-- | hw/xfree86/common/compiler.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h index 7144c6a27..2b2008b3f 100644 --- a/hw/xfree86/common/compiler.h +++ b/hw/xfree86/common/compiler.h @@ -758,36 +758,6 @@ inl(unsigned short port) return xf86ReadMmio32Le((void *) ioBase, port); } -#elif defined(__arm__) && defined(__linux__) - -/* for Linux 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. */ - -#include <sys/io.h> - -static __inline__ void -xf_outb(unsigned short port, unsigned char val) -{ - outb(val, port); -} - -static __inline__ void -xf_outw(unsigned short port, unsigned short val) -{ - outw(val, port); -} - -static __inline__ void -xf_outl(unsigned short port, unsigned int val) -{ - outl(val, port); -} - -#define outb xf_outb -#define outw xf_outw -#define outl xf_outl - #elif defined(__nds32__) /* |