Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Jan 2019 07:25:55 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r489754 - in head/x11-servers/xorg-server: . files
Message-ID:  <201901090725.x097Ptmm050688@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Wed Jan  9 07:25:55 2019
New Revision: 489754
URL: https://svnweb.freebsd.org/changeset/ports/489754

Log:
  Fix illegal instruction when running in kvm/qemu
  
  Fix illegal instruction when running xserver in kvm or qemu (and possibly
  others) virtualisation.  This is solved by disabling sse instructions while
  compiling the xf86SlowBcopy (don't ask) function.
  
  This fix was originally committed by dim as r396167 in 2015, and then most
  likely accidentally removed in r433863 in 2017.
  
  Bump portrevision
  
  Original commit message:
  
  > Disable use of SSE instructions in Xorg's xf86SlowBcopy() function.
  >
  > When such instructions are used to copy data from/to mapped video
  > memory, some hypervisors (e.g. KVM, Microsoft Hyper-V) can generate
  > SIGILL or SIGBUS exceptions, causing Xorg to crash.
  
  PR:		202643
  Reported by:	nogcjx@fastmail.fm
  Requested by:	dim
  Diagnose and fix by:	dim
  MFH:		2019Q1

Added:
  head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
     - copied unchanged from r433862, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Wed Jan  9 06:05:52 2019	(r489753)
+++ head/x11-servers/xorg-server/Makefile	Wed Jan  9 07:25:55 2019	(r489754)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION?=	1.18.4
-PORTREVISION?=	10
+PORTREVISION?=	11
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver

Copied: head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in (from r433862, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in	Wed Jan  9 07:25:55 2019	(r489754, copy of r433862, head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in)
@@ -0,0 +1,12 @@
+--- hw/xfree86/os-support/misc/Makefile.in.orig	2015-09-23 10:21:18.470900000 +0200
++++ hw/xfree86/os-support/misc/Makefile.in	2015-09-23 10:22:34.979974000 +0200
+@@ -530,7 +530,8 @@
+ 
+ #AM_LDFLAGS = -r
+ AM_CPPFLAGS = $(XORG_INCS)
+-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
++@I386_VIDEO_TRUE@I386_VIDEO_CFLAGS = -mno-sse
++AM_CFLAGS = $(I386_VIDEO_CFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS)
+ EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS)
+ all: all-am
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201901090725.x097Ptmm050688>