aboutsummaryrefslogtreecommitdiffstats
path: root/x11-servers
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-09-05 19:57:51 +0800
committerdim <dim@FreeBSD.org>2015-09-05 19:57:51 +0800
commitf75ebf49d0fe3b4bdf85a4be2ae35ced5a197f21 (patch)
tree4ceab2b04fe14b700d40e09f52ec04fd01b3b392 /x11-servers
parent83a74528f242e9e881085da0ced74200a223648c (diff)
downloadfreebsd-ports-gnome-f75ebf49d0fe3b4bdf85a4be2ae35ced5a197f21.tar.gz
freebsd-ports-gnome-f75ebf49d0fe3b4bdf85a4be2ae35ced5a197f21.tar.zst
freebsd-ports-gnome-f75ebf49d0fe3b4bdf85a4be2ae35ced5a197f21.zip
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@fastmail.fm Approved by: x11 (bapt) PR: 202643 MFH: 2015Q3
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/xorg-server/Makefile2
-rw-r--r--x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in12
2 files changed, 13 insertions, 1 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index aa3cfcea97cd..c99e28c77ed5 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -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
diff --git a/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in b/x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in
new file mode 100644
index 000000000000..c125955b2ac5
--- /dev/null
+++ b/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-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)
++@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
+