summaryrefslogtreecommitdiff
path: root/xserver/hw/xfree86
diff options
context:
space:
mode:
authorVisa Hankala <visa@cvs.openbsd.org>2021-03-13 13:42:27 +0000
committerVisa Hankala <visa@cvs.openbsd.org>2021-03-13 13:42:27 +0000
commitf9048e0cd4b29897397d8348727401c97373b001 (patch)
tree1125c204b7b7190609db41eab2eecee615ee59ad /xserver/hw/xfree86
parent45f4815a1228a47a05434d506beb6fbb1bd79500 (diff)
compiler.h: don't define inb/outb and friends on mips
From Julien Cristau 0148a15da1616a868d71abe1b56e3f28cc79533c in xserver git without arm_video.c changes. Fixes clang 11 build on mips64. Input and OK jsg@
Diffstat (limited to 'xserver/hw/xfree86')
-rw-r--r--xserver/hw/xfree86/common/compiler.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/xserver/hw/xfree86/common/compiler.h b/xserver/hw/xfree86/common/compiler.h
index 7fb1ba9d1..eb788d3fd 100644
--- a/xserver/hw/xfree86/common/compiler.h
+++ b/xserver/hw/xfree86/common/compiler.h
@@ -518,14 +518,10 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset,
barrier();
}
-#elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__))
-#if defined(__arm32__) || defined(__mips64__)
+#elif defined(__arm32__) && !defined(__linux__)
#define PORT_SIZE long
-#else
-#define PORT_SIZE short
-#endif
-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
static __inline__ void
outb(unsigned PORT_SIZE port, unsigned char val)