Upstream commit fe4cd0e7f5c58fa94 re-applied to xorg-server-1.20.5 Signed-off-by: Stephen L Arnold see bug https://bugs.gentoo.org/700120 and upstream https://gitlab.freedesktop.org/xorg/xserver/issues/840 --- hw/xfree86/common/compiler.h | 30 ------------------------------ 1 file changed, 30 deletions(-) --- a/hw/xfree86/common/compiler.h 2019-11-14 15:49:15.907914452 -0800 +++ b/hw/xfree86/common/compiler.h 2019-11-14 15:49:37.447937610 -0800 @@ -758,36 +758,6 @@ 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 - -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__) /*