svn commit: r396167 - in head/x11-servers/xorg-server: . files

[Dimitry Andric]

Author: dim (src committer)
Date: Sat Sep  5 11:57:51 2015
New Revision: 396167
URL: https://svnweb.freebsd.org/changeset/ports/396167

Log:
  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.
  
  Reported by:	nogcjx at fastmail.fm
  Approved by:	x11 (bapt)
  PR:		202643
  MFH:		2015Q3

Added:
  head/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in   (contents, props changed)
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Sat Sep  5 11:39:00 2015	(r396166)
+++ head/x11-servers/xorg-server/Makefile	Sat Sep  5 11:57:51 2015	(r396167)
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION=	1.14.7
-PORTREVISION?=	5
+PORTREVISION?=	6
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG/individual/xserver

Added: 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	Sat Sep  5 11:57:51 2015	(r396167)
@@ -0,0 +1,12 @@
+--- hw/xfree86/os-support/misc/Makefile.in.orig	2015-09-03 22:36:34.000000000 +0000
++++ hw/xfree86/os-support/misc/Makefile.in	2015-09-03 22:33:10.000000000 +0000
+@@ -445,7 +445,8 @@ libmisc_la_SOURCES = SlowBcopy.c
+ 
+ #AM_LDFLAGS = -r
+ INCLUDES = $(XORG_INCS)
+-AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
++ at 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
+