Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging

wxx patch queue

# gpg: Signature made Tue 22 Mar 2016 18:18:36 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg:                 aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2  B78A E08C 21D5 6774 50AD

* remotes/weil/tags/pull-wxx-20160322:
  wxx: Add support for ncurses
  Remove unneeded include statements for setjmp.h
  Include setjmp.h in qemu/osdep.h (bug fix for w64)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

diff --git a/configure b/configure
index b88d0dbbf9a4f557727c595afbfbb2b95ea2eebb..f4a03b89e59dd462e30b9f3045b6c04c48089722 100755 (executable)
--- a/configure
+++ b/configure
@@ -2836,7 +2836,7 @@ fi
 # curses probe
 if test "$curses" != "no" ; then
   if test "$mingw32" = "yes" ; then
-    curses_list="-lpdcurses"
+    curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
   else
     curses_list="$($pkg_config --libs ncurses 2>/dev/null):-lncurses:-lcurses"
   fi

diff --git a/disas/i386.c b/disas/i386.c
index d40b72ab10140f38f9e28320aae128c4a27fcf0a..394ffe14f3e4aca209f1bc6d2c70d84e0700fdb7 100644 (file)
--- a/disas/i386.c
+++ b/disas/i386.c
@@ -153,8 +153,6 @@
 /* opcodes/i386-dis.c r1.126 */
 #include "qemu-common.h"
 
-#include <setjmp.h>
-
 static int fetch_data2(struct disassemble_info *, bfd_byte *);
 static int fetch_data(struct disassemble_info *, bfd_byte *);
 static void ckprefix (void);

diff --git a/disas/m68k.c b/disas/m68k.c
index 0412ecd4b6883567c976971248fb6e2f15589d80..8f74ae1157e29308ef15d913f98097cbcfb76fca 100644 (file)
--- a/disas/m68k.c
+++ b/disas/m68k.c
@@ -615,8 +615,6 @@ static const char *const reg_half_names[] =
 /* Maximum length of an instruction.  */
 #define MAXLEN 22
 
-#include <setjmp.h>
-
 struct private
 {
   /* Points to first byte not fetched.  */

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 4538fdca42c12a32e54532af06f0f7539885623c..5bb374c3c6d211d13182df535dd74ea0b68da12e 100644 (file)
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -76,6 +76,9 @@ extern int daemon(int, int);
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <assert.h>
+/* setjmp must be declared before sysemu/os-win32.h
+ * because it is redefined there. */
+#include <setjmp.h>
 #include <signal.h>
 
 #ifdef __OpenBSD__

diff --git a/include/qom/cpu.h b/include/qom/cpu.h
index 7052eee7b78ad1e1c9ccf96e7a3dddd953ee9329..4a6def71175f21c447ee6375aa9093a09c19bbef 100644 (file)
--- a/include/qom/cpu.h
+++ b/include/qom/cpu.h
@@ -20,7 +20,6 @@
 #ifndef QEMU_CPU_H
 #define QEMU_CPU_H
 
-#include <setjmp.h>
 #include "hw/qdev-core.h"
 #include "disas/bfd.h"
 #include "exec/hwaddr.h"

diff --git a/scripts/clean-includes b/scripts/clean-includes
index 177d253eb9340db7c76343ec81d58c5597c9aa56..fb2a49c3b8a1fd294ddc7990688181d5b480cac5 100755 (executable)
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -140,7 +140,7 @@ for f in "$@"; do
   perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ ||
                           ! (grep { $_ eq $1 } qw (
            "config-host.h" "qemu/compiler.h" "config.h"
-           <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
+           <setjmp.h> <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
            <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
            <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
            <sys/stat.h> <sys/time.h> <assert.h> <signal.h>

diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index 6b8aee7a2b779dbc571ff6de921e90cfa58f9ab9..a7c33665538b6e8ad32e5fb13474b73f1cf03cb2 100644 (file)
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -26,7 +26,6 @@
 #undef _FORTIFY_SOURCE
 #endif
 #include "qemu/osdep.h"
-#include <setjmp.h>
 #include <pthread.h>
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"

diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c
index 4914f6019916eba9273e6c9710de95ff602f0e81..2bb7e10d4bfcdfcaed47548b3909daf2ec475594 100644 (file)
--- a/util/coroutine-ucontext.c
+++ b/util/coroutine-ucontext.c
@@ -23,7 +23,6 @@
 #undef _FORTIFY_SOURCE
 #endif
 #include "qemu/osdep.h"
-#include <setjmp.h>
 #include <ucontext.h>
 #include "qemu-common.h"
 #include "qemu/coroutine_int.h"

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 7615be4e7a9fdab889930f32a92c5d6509668417..05c44ed4d246ba1864bf1f73ce532e0355f89792 100644 (file)
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -49,7 +49,6 @@
 #include "qemu/sockets.h"
 #include <sys/mman.h>
 #include <libgen.h>
-#include <setjmp.h>
 #include <sys/signal.h>
 
 #ifdef CONFIG_LINUX