diff -uNr xorg-server-1.20.1/hw/xfree86/common/compiler.h xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h --- xorg-server-1.20.1/hw/xfree86/common/compiler.h 2018-08-07 19:31:02.000000000 +0300 +++ xorg-server-1.20.1.mod/hw/xfree86/common/compiler.h 2018-10-08 21:07:16.804247702 +0300 @@ -518,7 +518,7 @@ barrier(); } -#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) +#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) || defined(__ANDROID__) #if defined(__arm32__) || defined(__mips64) #define PORT_SIZE long #else @@ -758,7 +758,7 @@ return xf86ReadMmio32Le((void *) ioBase, port); } -#elif defined(__arm__) && defined(__linux__) +#elif defined(__arm__) && defined(__linux__) && !defined(__ANDROID__) /* for Linux on ARM, we use the LIBC inx/outx routines */ /* note that the appropriate setup via "ioperm" needs to be done */