3 --- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h 2015-10-28 19:15:36.000000000 +0100
4 +++ xorg-server-1.18.0/hw/xfree86/common/compiler.h 2016-01-08 01:41:49.582326445 +0100
5 @@ -525,26 +525,26 @@ xf86WriteMmio32Le(__volatile__ void *bas
6 #define PORT_SIZE short
9 -_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
10 +_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */
12 static __inline__ void
13 outb(unsigned PORT_SIZE port, unsigned char val)
15 - *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
16 + *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
20 static __inline__ void
21 outw(unsigned PORT_SIZE port, unsigned short val)
23 - *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
24 + *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
28 static __inline__ void
29 outl(unsigned PORT_SIZE port, unsigned int val)
31 - *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
32 + *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
36 @@ -552,21 +552,21 @@ static __inline__ unsigned int
37 inb(unsigned PORT_SIZE port)
39 return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
44 static __inline__ unsigned int
45 inw(unsigned PORT_SIZE port)
47 return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
52 static __inline__ unsigned int
53 inl(unsigned PORT_SIZE port)
55 return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
61 @@ -758,7 +758,7 @@ inl(unsigned short port)
62 return xf86ReadMmio32Le((void *) ioBase, port);
65 -#elif defined(__arm__) && defined(__linux__)
66 +#elif defined(__arm__) && defined(__GLIBC__)
68 /* for Linux on ARM, we use the LIBC inx/outx routines */
69 /* note that the appropriate setup via "ioperm" needs to be done */