diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2019-01-09 07:25:55 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2019-01-09 07:25:55 +0000 |
| commit | cad8743cbb0d064db857a4981e668db752eeb12e (patch) | |
| tree | 2b8d1cc19480442750edd3bb5f4cde2b03190802 /x11-servers | |
| parent | f74e8a57e51cdab4104096cddaac2c9fcbf8069b (diff) | |
| download | ports-cad8743cbb0d064db857a4981e668db752eeb12e.tar.gz ports-cad8743cbb0d064db857a4981e668db752eeb12e.zip | |
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
Notes
Notes:
svn path=/head/; revision=489754
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 06dfd7110a8c..8052600a8717 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -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 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..8a05ae6b33cb --- /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-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 + |