1From fc04acfd948ac99d04a5dc08c78f3b13bc0c5c41 Mon Sep 17 00:00:00 2001 2From: Khem Raj <raj.khem@gmail.com> 3Date: Mon, 17 Aug 2020 10:50:51 -0700 4Subject: [PATCH] Avoid duplicate definitions of IOPortBase 5 6This fixed build with gcc10/-fno-common 7 8Fixes 9compiler.h:528: multiple definition of `IOPortBase'; 10 11Upstream-Status: Pending 12Signed-off-by: Khem Raj <raj.khem@gmail.com> 13--- 14 hw/xfree86/common/compiler.h | 2 +- 15 hw/xfree86/os-support/linux/lnx_video.c | 1 + 16 2 files changed, 2 insertions(+), 1 deletion(-) 17 18diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h 19index 2b2008b..c7d617e 100644 20--- a/hw/xfree86/common/compiler.h 21+++ b/hw/xfree86/common/compiler.h 22@@ -525,7 +525,7 @@ xf86WriteMmio32Le(__volatile__ void *base, const unsigned long offset, 23 #define PORT_SIZE short 24 #endif 25 26-_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ 27+extern _X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ 28 29 static __inline__ void 30 outb(unsigned PORT_SIZE port, unsigned char val) 31diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c 32index 04e4509..9dc7316 100644 33--- a/hw/xfree86/os-support/linux/lnx_video.c 34+++ b/hw/xfree86/os-support/linux/lnx_video.c 35@@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) 36 /***************************************************************************/ 37 /* I/O Permissions section */ 38 /***************************************************************************/ 39+_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ 40 41 #if defined(__powerpc__) 42 volatile unsigned char *ioBase = NULL; 43-- 442.28.0 45 46