| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 17 Aug 2020 10:50:51 -0700 |
| 4 | Subject: [PATCH] Avoid duplicate definitions of IOPortBase |
| 5 | |
| 6 | This fixed build with gcc10/-fno-common |
| 7 | |
| 8 | Fixes |
| 9 | compiler.h:528: multiple definition of `IOPortBase'; |
| 10 | |
| 11 | Upstream-Status: Pending |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 13 | |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 14 | --- |
| 15 | hw/xfree86/os-support/linux/lnx_video.c | 1 + |
| 16 | 1 file changed, 1 insertion(+) |
| 17 | |
| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 18 | diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c |
| Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 19 | index fd83022..1d0d96e 100644 |
| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 20 | --- a/hw/xfree86/os-support/linux/lnx_video.c |
| 21 | +++ b/hw/xfree86/os-support/linux/lnx_video.c |
| 22 | @@ -78,6 +78,7 @@ xf86OSInitVidMem(VidMemInfoPtr pVidMem) |
| 23 | /***************************************************************************/ |
| 24 | /* I/O Permissions section */ |
| 25 | /***************************************************************************/ |
| 26 | +_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */ |
| 27 | |
| 28 | #if defined(__powerpc__) |
| 29 | volatile unsigned char *ioBase = NULL; |