diff options
Diffstat (limited to 'emulators/qemu/patches')
-rw-r--r-- | emulators/qemu/patches/patch-tests_Makefile | 8 | ||||
-rw-r--r-- | emulators/qemu/patches/patch-user-exec.c | 59 |
2 files changed, 4 insertions, 63 deletions
diff --git a/emulators/qemu/patches/patch-tests_Makefile b/emulators/qemu/patches/patch-tests_Makefile index 42be1c1c531..a5d2d9ee027 100644 --- a/emulators/qemu/patches/patch-tests_Makefile +++ b/emulators/qemu/patches/patch-tests_Makefile @@ -1,10 +1,10 @@ -$NetBSD: patch-tests_Makefile,v 1.1 2015/01/07 21:39:24 wiedi Exp $ +$NetBSD: patch-tests_Makefile,v 1.2 2015/04/29 20:30:53 ryoon Exp $ Don't link -lutil on SunOS ---- tests/Makefile.orig 2014-12-09 14:45:44.000000000 +0000 +--- tests/Makefile.orig 2015-04-27 14:08:27.000000000 +0000 +++ tests/Makefile -@@ -353,8 +353,10 @@ tests/qemu-iotests/socket_scm_helper$(EX - tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o libqemuutil.a libqemustub.a +@@ -371,8 +371,10 @@ tests/test-qemu-opts$(EXESUF): tests/tes + tests/test-write-threshold$(EXESUF): tests/test-write-threshold.o $(block-obj-y) libqemuutil.a libqemustub.a ifeq ($(CONFIG_POSIX),y) +ifneq ($(CONFIG_SOLARIS),y) diff --git a/emulators/qemu/patches/patch-user-exec.c b/emulators/qemu/patches/patch-user-exec.c deleted file mode 100644 index b527eb26b40..00000000000 --- a/emulators/qemu/patches/patch-user-exec.c +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-user-exec.c,v 1.5 2015/03/06 13:22:03 tnn Exp $ - -From 3f9744aaaeeaea9c55c814b9e7be0f8cce1fb7f9 Mon Sep 17 00:00:00 2001 -From: Tobias Nygren <tnn@NetBSD.org> -To: qemu-devel@nongnu.org -Cc: Tobias Nygren <tnn@NetBSD.org> -Date: Thu, 5 Mar 2015 22:15:08 +0100 -Subject: [PATCH] user-exec.c: fix build on NetBSD/sparc64 and NetBSD/arm - -A couple of #ifdef changes necessary to use NetBSD's ucontext -structs on sparc64 and arm. - -Signed-off-by: Tobias Nygren <tnn@NetBSD.org> ---- - user-exec.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/user-exec.c b/user-exec.c -index 1ff8673..8f57e8a 100644 ---- user-exec.c -+++ user-exec.c -@@ -404,6 +404,10 @@ int cpu_signal_handler(int host_signum, void *pinfo, - struct sigcontext *uc = puc; - unsigned long pc = uc->sc_pc; - void *sigmask = (void *)(long)uc->sc_mask; -+#elif defined(__NetBSD__) -+ ucontext_t *uc = puc; -+ unsigned long pc = _UC_MACHINE_PC(uc); -+ void *sigmask = (void *)&uc->uc_sigmask; - #endif - #endif - -@@ -441,15 +445,25 @@ int cpu_signal_handler(int host_signum, void *pinfo, - - #elif defined(__arm__) - -+#if defined(__NetBSD__) -+#include <ucontext.h> -+#endif -+ - int cpu_signal_handler(int host_signum, void *pinfo, - void *puc) - { - siginfo_t *info = pinfo; -+#if defined(__NetBSD__) -+ ucontext_t *uc = puc; -+#else - struct ucontext *uc = puc; -+#endif - unsigned long pc; - int is_write; - --#if defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) -+#if defined(__NetBSD__) -+ pc = uc->uc_mcontext.__gregs[_REG_R15]; -+#elif defined(__GLIBC__) && (__GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 3)) - pc = uc->uc_mcontext.gregs[R15]; - #else - pc = uc->uc_mcontext.arm_pc; |