Newer binutils requires cmpw access to %r11 to explicitly qualify the

16bit part as %r11w.

6 files changed, 45 insertions, 3 deletions

diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 8db53c29573..bd67213d3bc 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/11/04 01:32:39 agc Exp $
+$NetBSD: distinfo,v 1.21 2016/03/01 20:09:03 joerg Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@@ -19,5 +19,6 @@ SHA1 (patch-dc) = 606ad2af582b88ddfd250b952831af9d3b2b1f5d
 SHA1 (patch-gcc-version) = 1174ace3eee1d3707a2935498ac5a39671913f9f
 SHA1 (patch-xen_arch_x86_hvm_io.c) = 0f6dfc3b3857c2ab43fabf2c9693e2932b442931
 SHA1 (patch-xen_arch_x86_string.c) = 363d521a627d07cd9caffcfe1c529342b3b67321
+SHA1 (patch-xen_arch_x86_x86__64_entry.S) = 07d51949e979267601e65109f1e8ce4da93c085c
 SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
 SHA1 (patch-xen_include_xen_compat.h) = d9a4524088e034cf718f17f20f856bd907271b29
diff --git a/sysutils/xenkernel3/patches/patch-xen_arch_x86_x86__64_entry.S b/sysutils/xenkernel3/patches/patch-xen_arch_x86_x86__64_entry.S
new file mode 100644
index 00000000000..4f3c881e84e
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-xen_arch_x86_x86__64_entry.S
@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_arch_x86_x86__64_entry.S,v 1.1 2016/03/01 20:09:03 joerg Exp $
+
+--- xen/arch/x86/x86_64/entry.S.orig	2016-03-01 12:46:20.394327040 +0000
++++ xen/arch/x86/x86_64/entry.S
+@@ -47,7 +47,7 @@ restore_all_guest:
+         addq  $8,%rsp
+         popq  %rcx                    # RIP
+         popq  %r11                    # CS
+-        cmpw  $FLAT_KERNEL_CS32,%r11
++        cmpw  $FLAT_KERNEL_CS32,%r11w
+         popq  %r11                    # RFLAGS
+         popq  %rsp                    # RSP
+         je    1f
diff --git a/sysutils/xenkernel33/distinfo b/sysutils/xenkernel33/distinfo
index a8f6dd74d1c..4a9e40cef77 100644
--- a/sysutils/xenkernel33/distinfo
+++ b/sysutils/xenkernel33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2015/11/04 01:32:39 agc Exp $
+$NetBSD: distinfo,v 1.20 2016/03/01 20:09:04 joerg Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
@@ -16,4 +16,5 @@ SHA1 (patch-compat_memory_c) = f45daded92c0dac30213d6d7dcc81ac72ead7c47
 SHA1 (patch-include_xen_compat_h) = 96ba96ba31792f48c989f033f7706f09fd1171c2
 SHA1 (patch-xen_Makefile) = 30d27b40fb8f5c4ee663a6a82abf36db3b7ebd1c
 SHA1 (patch-xen_arch_x86_Rules.mk) = 81bdc8a653b57b5fcb9ae7d835f0284ab800dc21
+SHA1 (patch-xen_arch_x86_x86__64_entry.S) = 9bb46e2b8ba173725c62b39aba2941463d85245d
 SHA1 (patch-xen_common_libelf_libelf-private.h) = c364d8f247342c62d0d32fe9f4714f83f977719a
diff --git a/sysutils/xenkernel33/patches/patch-xen_arch_x86_x86__64_entry.S b/sysutils/xenkernel33/patches/patch-xen_arch_x86_x86__64_entry.S
new file mode 100644
index 00000000000..c350388e1ac
--- /dev/null
+++ b/sysutils/xenkernel33/patches/patch-xen_arch_x86_x86__64_entry.S
@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_arch_x86_x86__64_entry.S,v 1.1 2016/03/01 20:09:04 joerg Exp $
+
+--- xen/arch/x86/x86_64/entry.S.orig	2016-03-01 12:46:35.754573228 +0000
++++ xen/arch/x86/x86_64/entry.S
+@@ -54,7 +54,7 @@ restore_all_guest:
+         addq  $8,%rsp
+         popq  %rcx                    # RIP
+         popq  %r11                    # CS
+-        cmpw  $FLAT_USER_CS32,%r11
++        cmpw  $FLAT_USER_CS32,%r11w
+         popq  %r11                    # RFLAGS
+         popq  %rsp                    # RSP
+         je    1f
diff --git a/sysutils/xenkernel41/distinfo b/sysutils/xenkernel41/distinfo
index e559b3a0fc2..325261b9b2b 100644
--- a/sysutils/xenkernel41/distinfo
+++ b/sysutils/xenkernel41/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2016/01/07 17:55:55 bouyer Exp $
+$NetBSD: distinfo,v 1.42 2016/03/01 20:09:04 joerg Exp $
 
 SHA1 (xen-4.1.6.1.tar.gz) = e5f15feb0821578817a65ede16110c6eac01abd0
 RMD160 (xen-4.1.6.1.tar.gz) = bff11421fc44a26f2cc3156713267abcb36d7a19
@@ -41,6 +41,7 @@ SHA1 (patch-xen_Makefile) = d1c7e4860221f93d90818f45a77748882486f92b
 SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
 SHA1 (patch-xen_arch_x86_cpu_mcheck_vmce.c) = 5afd01780a13654f1d21bf1562f6431c8370be0b
 SHA1 (patch-xen_arch_x86_time.c) = 2c69ac1cb5e0ca06c4f70acb91d2723a32ce98a9
+SHA1 (patch-xen_arch_x86_x86__64_entry.S) = 92bea7885c418e643bd9697abb9655bee9d1750b
 SHA1 (patch-xen_drivers_char_console_c) = 0fe186369602ccffaeec6f4bfbee8bb4298d3ff0
 SHA1 (patch-xen_drivers_passthrough_vtd_x86_ats.c) = 012ccbb27069c4f2e0361bd127397fdd22027f29
 SHA1 (patch-xen_include_xen_stdarg.h) = e9df974a9b783ed442ab17497198432cb9844b70
diff --git a/sysutils/xenkernel41/patches/patch-xen_arch_x86_x86__64_entry.S b/sysutils/xenkernel41/patches/patch-xen_arch_x86_x86__64_entry.S
new file mode 100644
index 00000000000..625a19ec2ab
--- /dev/null
+++ b/sysutils/xenkernel41/patches/patch-xen_arch_x86_x86__64_entry.S
@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_arch_x86_x86__64_entry.S,v 1.1 2016/03/01 20:09:04 joerg Exp $
+
+--- xen/arch/x86/x86_64/entry.S.orig	2016-02-29 20:42:10.767055585 +0000
++++ xen/arch/x86/x86_64/entry.S
+@@ -51,7 +51,7 @@ restore_all_guest:
+         addq  $8,%rsp
+         popq  %rcx                    # RIP
+         popq  %r11                    # CS
+-        cmpw  $FLAT_USER_CS32,%r11
++        cmpw  $FLAT_USER_CS32,%r11w
+         popq  %r11                    # RFLAGS
+         popq  %rsp                    # RSP
+         je    1f