30 lines
1.1 KiB
Diff
30 lines
1.1 KiB
Diff
|
From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Khem Raj <raj.khem@gmail.com>
|
||
|
|
Date: Mon, 17 Aug 2020 10:50:51 -0700
|
||
|
|
Subject: [PATCH] Avoid duplicate definitions of IOPortBase
|
||
|
|
|
||
|
|
This fixed build with gcc10/-fno-common
|
||
|
|
|
||
|
|
Fixes
|
||
|
|
compiler.h:528: multiple definition of `IOPortBase';
|
||
|
|
|
||
|
|
Upstream-Status: Pending
|
||
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||
|
|
|
||
|
|
---
|
||
|
|
hw/xfree86/os-support/linux/lnx_video.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
|
||
|
|
index fd83022..1d0d96e 100644
|
||
|
|
--- a/hw/xfree86/os-support/linux/lnx_video.c
|
||
|
|
+++ b/hw/xfree86/os-support/linux/lnx_video.c
|
||
|
|
@@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem)
|
||
|
|
/***************************************************************************/
|
||
|
|
/* I/O Permissions section */
|
||
|
|
/***************************************************************************/
|
||
|
|
+_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
|
||
|
|
|
||
|
|
#if defined(__powerpc__)
|
||
|
|
volatile unsigned char *ioBase = NULL;
|