Julien Cristau pushed to branch debian-unstable at X Strike Force / xserver /
xorg-server
Commits:
166270c1 by Julien Cristau at 2021-01-06T10:34:02+01:00
Stop defining inb/outb on mips, to fix FTBFS in some drivers with GCC 10
(closes: #978670).
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/04_compiler_h_inb_outb_mips.diff
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+xorg-server (2:1.20.10-2) unstable; urgency=medium
+
+ * Stop defining inb/outb on mips, to fix FTBFS in some drivers with GCC 10
+ (closes: #978670).
+
+ -- Julien Cristau <jcris...@debian.org> Wed, 06 Jan 2021 10:33:33 +0100
+
xorg-server (2:1.20.10-1) unstable; urgency=medium
[ Timo Aaltonen ]
=====================================
debian/patches/04_compiler_h_inb_outb_mips.diff
=====================================
@@ -0,0 +1,60 @@
+From 5e9b9d11ce1662d0de6dd8b5e79e5f8870f7a397 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Wed, 6 Jan 2021 10:20:53 +0100
+Subject: [PATCH] compiler.h: don't define inb/outb and friends on mips
+
+The definition relies on IOPortBase, which is only ever set in
+hw/xfree86/os-support/bsd/arm_video.c
+
+This caused build failures on linux/mips with GCC 10, because anything
+including compiler.h would get its own definition of IOPortBase.
+---
+ hw/xfree86/common/compiler.h | 8 ++------
+ hw/xfree86/os-support/bsd/arm_video.c | 3 +++
+ 2 files changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
+index 2b2008b3f4..eb788d3fd7 100644
+--- a/hw/xfree86/common/compiler.h
++++ b/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)
+diff --git a/hw/xfree86/os-support/bsd/arm_video.c
b/hw/xfree86/os-support/bsd/arm_video.c
+index dd1020e33f..180d70543f 100644
+--- a/hw/xfree86/os-support/bsd/arm_video.c
++++ b/hw/xfree86/os-support/bsd/arm_video.c
+@@ -65,6 +65,7 @@
+ #include "xf86Priv.h"
+ #include "xf86_OSlib.h"
+ #include "xf86OSpriv.h"
++#include "compiler.h"
+
+ #if defined(__NetBSD__) && !defined(MAP_FILE)
+ #define MAP_FLAGS MAP_SHARED
+@@ -162,6 +163,8 @@ xf86DisableIO()
+
+ #if defined(USE_ARC_MMAP) || defined(__arm32__)
+
++unsigned int IOPortBase;
++
+ Bool
+ xf86EnableIO()
+ {
+--
+2.29.2
+
=====================================
debian/patches/series
=====================================
@@ -3,6 +3,7 @@
001_fedora_extramodes.patch
02_kbsd-input-devd.diff
03_static-nettle.diff
+04_compiler_h_inb_outb_mips.diff
05_Revert-Unload-submodules.diff
06_use-intel-only-on-pre-gen4.diff
07_use-modesetting-driver-by-default-on-GeForce.diff
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/166270c125545106eba7984b3591f0108ee85139
--
View it on GitLab:
https://salsa.debian.org/xorg-team/xserver/xorg-server/-/commit/166270c125545106eba7984b3591f0108ee85139
You're receiving this email because of your account on salsa.debian.org.
