diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-09-05 11:57:51 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-09-05 11:57:51 +0000 |
| commit | 6edde2ba509f0c1e04b8d98eda5078f13fff92bc (patch) | |
| tree | 4ceab2b04fe14b700d40e09f52ec04fd01b3b392 /x11-servers | |
| parent | a5db7d5da78e6d5c2529d2c5d11c9f68af71f27f (diff) | |
| download | ports-6edde2ba509f0c1e04b8d98eda5078f13fff92bc.tar.gz ports-6edde2ba509f0c1e04b8d98eda5078f13fff92bc.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
Notes
Notes:
svn path=/head/; revision=396167
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 2 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-Xserver-hw-xfree86-os-support-misc-Makefile.in | 12 |
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 + |