<div dir="ltr">This fails if x11 isn&#39;t in DISTRO_FEATURES but SDL is enabled as ui/sdl.c -&gt; ui/x_keymap.h -&gt; Xlib.h.  I guess the best solution here would be to guard sdl in the default PACKAGECONFIG with x11 DISTRO_FEATURE checks, and explicitly depend on libx11.<div><br></div><div>As discussed on IRC we should probably also move to libsdl2 as libsdl 1.2 is &#39;historic&#39; now.</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 2 May 2018 at 15:37, Martin Jansa <span dir="ltr">&lt;<a href="mailto:martin.jansa@gmail.com" target="_blank">martin.jansa@gmail.com</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Signed-off-by: Martin Jansa &lt;<a href="mailto:Martin.Jansa@gmail.com">Martin.Jansa@gmail.com</a>&gt;<br>
---<br>
 meta/conf/distro/include/<wbr>tcmode-default.inc   |  2 +-<br>
 ...4-treat-DISAS_UPDATE-as-<wbr>variant-of-D.patch | 67 -------------------<br>
 ...-connect-socket-to-a-<wbr>spawned-command.patch | 52 +++++++-------<br>
 .../qemu/qemu/disable-grabs.<wbr>patch             | 43 ++++++------<br>
 meta/recipes-devtools/qemu/<wbr>qemu/memfd.patch   | 57 ----------------<br>
 .../qemu/qemu/qemu-2.5.0-<wbr>cflags.patch         | 15 ++++-<br>
 .../qemu/{<a href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">qemu_2.11.1.bb</a> =&gt; <a href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">qemu_2.12.0.bb</a>}   |  6 +-<br>
 7 files changed, 65 insertions(+), 177 deletions(-)<br>
 delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/0001-arm-translate-a64-<wbr>treat-DISAS_UPDATE-as-variant-<wbr>of-D.patch<br>
 delete mode 100644 meta/recipes-devtools/qemu/<wbr>qemu/memfd.patch<br>
 rename meta/recipes-devtools/qemu/{<a href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">qe<wbr>mu_2.11.1.bb</a> =&gt; <a href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">qemu_2.12.0.bb</a>} (87%)<br>
<br>
diff --git a/meta/conf/distro/include/<wbr>tcmode-default.inc b/meta/conf/distro/include/<wbr>tcmode-default.inc<br>
index 00399ae820..8b5214ed96 100644<br>
--- a/meta/conf/distro/include/<wbr>tcmode-default.inc<br>
+++ b/meta/conf/distro/include/<wbr>tcmode-default.inc<br>
@@ -28,7 +28,7 @@ BINUVERSION ?= &quot;2.30%&quot;<br>
 GDBVERSION ?= &quot;8.0%&quot;<br>
 GLIBCVERSION ?= &quot;2.27%&quot;<br>
 LINUXLIBCVERSION ?= &quot;4.15%&quot;<br>
-QEMUVERSION ?= &quot;2.11%&quot;<br>
+QEMUVERSION ?= &quot;2.12%&quot;<br>
<br>
 PREFERRED_VERSION_gcc ?= &quot;${GCCVERSION}&quot;<br>
 PREFERRED_VERSION_gcc-cross-${<wbr>TARGET_ARCH} ?= &quot;${GCCVERSION}&quot;<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/0001-arm-translate-a64-<wbr>treat-DISAS_UPDATE-as-variant-<wbr>of-D.patch b/meta/recipes-devtools/qemu/<wbr>qemu/0001-arm-translate-a64-<wbr>treat-DISAS_UPDATE-as-variant-<wbr>of-D.patch<br>
deleted file mode 100644<br>
index f90cae694c..0000000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/0001-arm-translate-a64-<wbr>treat-DISAS_UPDATE-as-variant-<wbr>of-D.patch<br>
+++ /dev/null<br>
@@ -1,67 +0,0 @@<br>
-From a75a52d62418dafe462be4fe304855<wbr>01d1010bb9 Mon Sep 17 00:00:00 2001<br>
-From: Victor Kamensky &lt;<a href="mailto:kamensky@cisco.com">kamensky@cisco.com</a>&gt;<br>
-Date: Fri, 23 Mar 2018 18:26:45 +0000<br>
-Subject: [PATCH] arm/translate-a64: treat DISAS_UPDATE as variant of<br>
- DISAS_EXIT<br>
-MIME-Version: 1.0<br>
-Content-Type: text/plain; charset=UTF-8<br>
-Content-Transfer-Encoding: 8bit<br>
-<br>
-In OE project 4.15 linux kernel boot hang was observed under<br>
-single cpu aarch64 qemu. Kernel code was in a loop waiting for<br>
-vtimer arrival, spinning in TC generated blocks, while interrupt<br>
-was pending unprocessed. This happened because when qemu tried to<br>
-handle vtimer interrupt target had interrupts disabled, as<br>
-result flag indicating TCG exit, cpu-&gt;icount_decr.u16.high,<br>
-was cleared but arm_cpu_exec_interrupt function did not call<br>
-arm_cpu_do_interrupt to process interrupt. Later when target<br>
-reenabled interrupts, it happened without exit into main loop, so<br>
-following code that waited for result of interrupt execution<br>
-run in infinite loop.<br>
-<br>
-To solve the problem instructions that operate on CPU sys state<br>
-(i.e enable/disable interrupt), and marked as DISAS_UPDATE,<br>
-should be considered as DISAS_EXIT variant, and should be<br>
-forced to exit back to main loop so qemu will have a chance<br>
-processing pending CPU state updates, including pending<br>
-interrupts.<br>
-<br>
-This change brings consistency with how DISAS_UPDATE is treated<br>
-in aarch32 case.<br>
-<br>
-CC: Peter Maydell &lt;<a href="mailto:peter.maydell@linaro.org">peter.maydell@linaro.org</a>&gt;<br>
-CC: Alex Bennée &lt;<a href="mailto:alex.bennee@linaro.org">alex.bennee@linaro.org</a>&gt;<br>
-CC: <a href="mailto:qemu-stable@nongnu.org">qemu-stable@nongnu.org</a><br>
-Suggested-by: Peter Maydell &lt;<a href="mailto:peter.maydell@linaro.org">peter.maydell@linaro.org</a>&gt;<br>
-Signed-off-by: Victor Kamensky &lt;<a href="mailto:kamensky@cisco.com">kamensky@cisco.com</a>&gt;<br>
-Reviewed-by: Richard Henderson &lt;<a href="mailto:richard.henderson@linaro.org">richard.henderson@linaro.org</a>&gt;<br>
-Message-id: <a href="mailto:1521526368-1996-1-git-send-email-kamensky@cisco.com">1521526368-1996-1-git-send-<wbr>email-kamensky@cisco.com</a><br>
-Signed-off-by: Peter Maydell &lt;<a href="mailto:peter.maydell@linaro.org">peter.maydell@linaro.org</a>&gt;<br>
-Upstream-Status: Backport<br>
----<br>
- target/arm/translate-a64.c | 6 +++---<br>
- 1 file changed, 3 insertions(+), 3 deletions(-)<br>
-<br>
-diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c<br>
-index 31ff047..327513e 100644<br>
---- a/target/arm/translate-a64.c<br>
-+++ b/target/arm/translate-a64.c<br>
-@@ -13378,12 +13378,12 @@ static void aarch64_tr_tb_stop(<wbr>DisasContextBase *dcbase, CPUState *cpu)<br>
-         case DISAS_UPDATE:<br>
-             gen_a64_set_pc_im(dc-&gt;pc);<br>
-             /* fall through */<br>
--        case DISAS_JUMP:<br>
--            tcg_gen_lookup_and_goto_ptr();<br>
--            break;<br>
-         case DISAS_EXIT:<br>
-             tcg_gen_exit_tb(0);<br>
-             break;<br>
-+        case DISAS_JUMP:<br>
-+            tcg_gen_lookup_and_goto_ptr();<br>
-+            break;<br>
-         case DISAS_NORETURN:<br>
-         case DISAS_SWI:<br>
-             break;<br>
--- <br>
-2.7.4<br>
-<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/chardev-connect-socket-<wbr>to-a-spawned-command.patch b/meta/recipes-devtools/qemu/<wbr>qemu/chardev-connect-socket-<wbr>to-a-spawned-command.patch<br>
index 6e6bf95c18..f1cf53a8c5 100644<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/chardev-connect-socket-<wbr>to-a-spawned-command.patch<br>
+++ b/meta/recipes-devtools/qemu/<wbr>qemu/chardev-connect-socket-<wbr>to-a-spawned-command.patch<br>
@@ -1,4 +1,4 @@<br>
-From 3bb3100c22eb30146a69656480bdff<wbr>eef8663575 Mon Sep 17 00:00:00 2001<br>
+From a7690b02df70e0d3957e6eaa1e1cf9<wbr>2595839fbb Mon Sep 17 00:00:00 2001<br>
 From: Alistair Francis &lt;<a href="mailto:alistair.francis@xilinx.com">alistair.francis@xilinx.com</a>&gt;<br>
 Date: Thu, 21 Dec 2017 11:35:16 -0800<br>
 Subject: [PATCH] chardev: connect socket to a spawned command<br>
@@ -45,16 +45,16 @@ Upstream-Status: Inappropriate [embedded specific]<br>
<br>
 Signed-off-by: Patrick Ohly &lt;<a href="mailto:patrick.ohly@intel.com">patrick.ohly@intel.com</a>&gt;<br>
 ---<br>
- chardev/char-socket.c | 86 ++++++++++++++++++++++++++++++<wbr>++++++++++++++++++---<br>
- chardev/char.c        |  3 ++<br>
- qapi/char.json        |  5 +++<br>
- 3 files changed, 90 insertions(+), 4 deletions(-)<br>
+ chardev/char-socket.c | 102 ++++++++++++++++++++++++++++++<wbr>++++++++++++<br>
+ chardev/char.c        |   3 ++<br>
+ qapi/char.json        |   5 +++<br>
+ 3 files changed, 110 insertions(+)<br>
<br>
 diff --git a/chardev/char-socket.c b/chardev/char-socket.c<br>
-index 53eda8ef00..f566107c35 100644<br>
+index 159e69c3b1..84778cf31a 100644<br>
 --- a/chardev/char-socket.c<br>
 +++ b/chardev/char-socket.c<br>
-@@ -852,6 +852,68 @@ static gboolean socket_reconnect_timeout(<wbr>gpointer opaque)<br>
+@@ -934,6 +934,68 @@ static gboolean socket_reconnect_timeout(<wbr>gpointer opaque)<br>
      return false;<br>
  }<br>
<br>
@@ -123,7 +123,7 @@ index 53eda8ef00..f566107c35 100644<br>
  static void qmp_chardev_open_socket(<wbr>Chardev *chr,<br>
                                      ChardevBackend *backend,<br>
                                      bool *be_opened,<br>
-@@ -859,6 +921,9 @@<br>
+@@ -941,6 +1003,9 @@ static void qmp_chardev_open_socket(<wbr>Chardev *chr,<br>
  {<br>
      SocketChardev *s = SOCKET_CHARDEV(chr);<br>
      ChardevSocket *sock = backend-&gt;u.socket.data;<br>
@@ -133,11 +133,10 @@ index 53eda8ef00..f566107c35 100644<br>
      bool do_nodelay     = sock-&gt;has_nodelay ? sock-&gt;nodelay : false;<br>
      bool is_listen      = sock-&gt;has_server  ? sock-&gt;server  : true;<br>
      bool is_telnet      = sock-&gt;has_telnet  ? sock-&gt;telnet  : false;<br>
-@@ -925,7 +990,14 @@<br>
-     } else if (reconnect &gt; 0) {<br>
+@@ -1008,6 +1073,14 @@ static void qmp_chardev_open_socket(<wbr>Chardev *chr,<br>
          s-&gt;reconnect_time = reconnect;<br>
      }<br>
--<br>
+ <br>
 +#ifndef _WIN32<br>
 +    if (cmd) {<br>
 +        chardev_open_socket_cmd(chr, cmd, errp);<br>
@@ -146,12 +145,12 @@ index 53eda8ef00..f566107c35 100644<br>
 +        *be_opened = true;<br>
 +    } else<br>
 +#endif<br>
-     if (s-&gt;reconnect_time) {<br>
-         sioc = qio_channel_socket_new();<br>
-         tcp_chr_set_client_ioc_name(<wbr>chr, sioc);<br>
-@@ -985,10 +1057,26 @@<br>
-     const char *host = qemu_opt_get(opts, &quot;host&quot;);<br>
+     /* If reconnect_time is set, will do that in chr_machine_done. */<br>
+     if (!s-&gt;reconnect_time) {<br>
+         if (s-&gt;is_listen) {<br>
+@@ -1065,9 +1138,26 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,<br>
      const char *port = qemu_opt_get(opts, &quot;port&quot;);<br>
+     const char *fd = qemu_opt_get(opts, &quot;fd&quot;);<br>
      const char *tls_creds = qemu_opt_get(opts, &quot;tls-creds&quot;);<br>
 +#ifndef _WIN32<br>
 +    const char *cmd = qemu_opt_get(opts, &quot;cmd&quot;);<br>
@@ -159,7 +158,6 @@ index 53eda8ef00..f566107c35 100644<br>
      SocketAddressLegacy *addr;<br>
      ChardevSocket *sock;<br>
<br>
-     backend-&gt;type = CHARDEV_BACKEND_KIND_SOCKET;<br>
 +#ifndef _WIN32<br>
 +    if (cmd) {<br>
 +        /*<br>
@@ -173,17 +171,18 @@ index 53eda8ef00..f566107c35 100644<br>
 +        }<br>
 +    } else<br>
 +#endif<br>
-     if (!path) {<br>
-         if (!host) {<br>
-             error_setg(errp, &quot;chardev: socket: no host given&quot;);<br>
-@@ -1021,13 +1109,24 @@<br>
-     sock-&gt;has_reconnect = true;<br>
++<br>
+     if ((!!path + !!fd + !!host) != 1) {<br>
+         error_setg(errp,<br>
+                    &quot;Exactly one of &#39;path&#39;, &#39;fd&#39; or &#39;host&#39; required&quot;);<br>
+@@ -1112,12 +1202,24 @@ static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,<br>
      sock-&gt;reconnect = reconnect;<br>
      sock-&gt;tls_creds = g_strdup(tls_creds);<br>
+ <br>
 +#ifndef _WIN32<br>
 +    sock-&gt;cmd = g_strdup(cmd);<br>
 +#endif<br>
- <br>
++ <br>
      addr = g_new0(SocketAddressLegacy, 1);<br>
 +#ifndef _WIN32<br>
 +    if (path || cmd) {<br>
@@ -198,11 +197,11 @@ index 53eda8ef00..f566107c35 100644<br>
 +#else<br>
          q_unix-&gt;path = g_strdup(path);<br>
 +#endif<br>
-     } else {<br>
+     } else if (host) {<br>
          addr-&gt;type = SOCKET_ADDRESS_LEGACY_KIND_<wbr>INET;<br>
          addr-&gt;u.inet.data = g_new(InetSocketAddress, 1);<br>
 diff --git a/chardev/char.c b/chardev/char.c<br>
-index 2ae4f465ec..5d52cd5de5 100644<br>
+index 76d866e6fe..9747d51d7c 100644<br>
 --- a/chardev/char.c<br>
 +++ b/chardev/char.c<br>
 @@ -792,6 +792,9 @@ QemuOptsList qemu_chardev_opts = {<br>
@@ -239,4 +238,5 @@ index ae19dcd1ed..6de0f29bcd 100644<br>
                                       &#39;*server&#39;    : &#39;bool&#39;,<br>
                                       &#39;*wait&#39;      : &#39;bool&#39;,<br>
 -- <br>
-2.14.1<br>
+2.17.0<br>
+<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/disable-grabs.patch b/meta/recipes-devtools/qemu/<wbr>qemu/disable-grabs.patch<br>
index 77117890f4..e29c011a6f 100644<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/disable-grabs.patch<br>
+++ b/meta/recipes-devtools/qemu/<wbr>qemu/disable-grabs.patch<br>
@@ -1,3 +1,11 @@<br>
+From a31c5c695cb716310257f1fc60a06b<wbr>821e74fe7f Mon Sep 17 00:00:00 2001<br>
+From: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
+Date: Wed, 18 Sep 2013 14:04:54 +0100<br>
+Subject: [PATCH] sdl.c: allow user to disable pointer grabs<br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain; charset=UTF-8<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
 When the pointer enters the Qemu window it calls SDL_WM_GrabInput, which calls<br>
 XGrabPointer in a busyloop until it returns GrabSuccess. However if there&#39;s already<br>
 a pointer grab (screen is locked, a menu is open) then qemu will hang until the<br>
@@ -11,35 +19,30 @@ them in a conditional that can be set by the autobuilder environment, preserving<br>
 the current grabbing behaviour for everyone else.<br>
<br>
 Upstream-Status: Pending<br>
-Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
-<br>
-From 4b1988ecb01a178269ec0513a75f2e<wbr>c620c7ef6a Mon Sep 17 00:00:00 2001<br>
-From: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
-Date: Wed, 18 Sep 2013 14:04:54 +0100<br>
-Subject: [PATCH] sdl.c: allow user to disable pointer grabs<br>
-<br>
 Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
 Signed-off-by: Eric Bénard &lt;<a href="mailto:eric@eukrea.com">eric@eukrea.com</a>&gt;<br>
+<br>
 ---<br>
- ui/sdl.c | 12 ++++++++++--<br>
- 1 file changed, 10 insertions(+), 2 deletions(-)<br>
+ ui/sdl.c | 13 +++++++++++--<br>
+ 1 file changed, 11 insertions(+), 2 deletions(-)<br>
<br>
-Index: qemu-2.11.1/ui/sdl.c<br>
-=============================<wbr>==============================<wbr>========<br>
---- qemu-2.11.1.orig/ui/sdl.c<br>
-+++ qemu-2.11.1/ui/sdl.c<br>
-@@ -63,6 +63,10 @@ static SDL_PixelFormat host_format;<br>
- static int scaling_active = 0;<br>
- static Notifier mouse_mode_notifier;<br>
- static int idle_counter;<br>
+diff --git a/ui/sdl.c b/ui/sdl.c<br>
+index a5fd503..ab8d1b1 100644<br>
+--- a/ui/sdl.c<br>
++++ b/ui/sdl.c<br>
+@@ -68,6 +68,11 @@ static int idle_counter;<br>
+ static const guint16 *keycode_map;<br>
+ static size_t keycode_maplen;<br>
+ <br>
 +#ifndef True<br>
 +#define True 1<br>
 +#endif<br>
 +static doing_grabs = True;<br>
- <br>
++<br>
  #define SDL_REFRESH_INTERVAL_BUSY 10<br>
  #define SDL_MAX_IDLE_COUNT (2 * GUI_REFRESH_INTERVAL_DEFAULT \<br>
-@@ -431,14 +435,16 @@ static void sdl_grab_start(void)<br>
+                             / SDL_REFRESH_INTERVAL_BUSY + 1)<br>
+@@ -398,14 +403,16 @@ static void sdl_grab_start(void)<br>
          }<br>
      } else<br>
          sdl_hide_cursor();<br>
@@ -58,7 +61,7 @@ Index: qemu-2.11.1/ui/sdl.c<br>
      gui_grab = 0;<br>
      sdl_show_cursor();<br>
      sdl_update_caption();<br>
-@@ -986,6 +992,8 @@ void sdl_display_init(DisplayState *ds,<br>
+@@ -945,6 +952,8 @@ static void sdl1_display_init(DisplayState *ds, DisplayOptions *o)<br>
       * This requires SDL &gt;= 1.2.14. */<br>
      setenv(&quot;SDL_DISABLE_LOCK_KEYS&quot;<wbr>, &quot;1&quot;, 1);<br>
<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/memfd.patch b/meta/recipes-devtools/qemu/<wbr>qemu/memfd.patch<br>
deleted file mode 100644<br>
index 62e8d3800b..0000000000<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/memfd.patch<br>
+++ /dev/null<br>
@@ -1,57 +0,0 @@<br>
-Upstream-Status: Backport<br>
-Signed-off-by: Ross Burton &lt;<a href="mailto:ross.burton@intel.com">ross.burton@intel.com</a>&gt;<br>
-<br>
-From 75e5b70e6b5dcc4f2219992d7cffa4<wbr>62aa406af0 Mon Sep 17 00:00:00 2001<br>
-From: Paolo Bonzini &lt;<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>&gt;<br>
-Date: Tue, 28 Nov 2017 11:51:27 +0100<br>
-Subject: [PATCH] memfd: fix configure test<br>
-MIME-Version: 1.0<br>
-Content-Type: text/plain; charset=UTF-8<br>
-Content-Transfer-Encoding: 8bit<br>
-<br>
-Recent glibc added memfd_create in sys/mman.h.  This conflicts with<br>
-the definition in util/memfd.c:<br>
-<br>
-    /builddir/build/BUILD/qemu-2.<wbr>11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration<br>
-<br>
-Fix the configure test, and remove the sys/memfd.h inclusion since the<br>
-file actually does not exist---it is a typo in the memfd_create(2) man<br>
-page.<br>
-<br>
-Cc: Marc-André Lureau &lt;<a href="mailto:marcandre.lureau@redhat.com">marcandre.lureau@redhat.com</a>&gt;<br>
-Signed-off-by: Paolo Bonzini &lt;<a href="mailto:pbonzini@redhat.com">pbonzini@redhat.com</a>&gt;<br>
----<br>
- configure    | 2 +-<br>
- util/memfd.c | 4 +---<br>
- 2 files changed, 2 insertions(+), 4 deletions(-)<br>
-<br>
-diff --git a/configure b/configure<br>
-index 9c8aa5a98b..99ccc1725a 100755<br>
---- a/configure<br>
-+++ b/configure<br>
-@@ -3923,7 +3923,7 @@ fi<br>
- # check if memfd is supported<br>
- memfd=no<br>
- cat &gt; $TMPC &lt;&lt; EOF<br>
--#include &lt;sys/memfd.h&gt;<br>
-+#include &lt;sys/mman.h&gt;<br>
- <br>
- int main(void)<br>
- {<br>
-diff --git a/util/memfd.c b/util/memfd.c<br>
-index 4571d1aba8..412e94a405 100644<br>
---- a/util/memfd.c<br>
-+++ b/util/memfd.c<br>
-@@ -31,9 +31,7 @@<br>
- <br>
- #include &quot;qemu/memfd.h&quot;<br>
- <br>
--#ifdef CONFIG_MEMFD<br>
--#include &lt;sys/memfd.h&gt;<br>
--#elif defined CONFIG_LINUX<br>
-+#if defined CONFIG_LINUX &amp;&amp; !defined CONFIG_MEMFD<br>
- #include &lt;sys/syscall.h&gt;<br>
- #include &lt;asm/unistd.h&gt;<br>
- <br>
--- <br>
-2.11.0<br>
diff --git a/meta/recipes-devtools/qemu/<wbr>qemu/qemu-2.5.0-cflags.patch b/meta/recipes-devtools/qemu/<wbr>qemu/qemu-2.5.0-cflags.patch<br>
index eb99d14639..360519f1a1 100644<br>
--- a/meta/recipes-devtools/qemu/<wbr>qemu/qemu-2.5.0-cflags.patch<br>
+++ b/meta/recipes-devtools/qemu/<wbr>qemu/qemu-2.5.0-cflags.patch<br>
@@ -1,8 +1,19 @@<br>
+From 6702ec74a7ba90b99efedde260c9f0<wbr>8b75d5516d Mon Sep 17 00:00:00 2001<br>
+From: Stephen Arnold &lt;<a href="mailto:sarnold@vctlabs.com">sarnold@vctlabs.com</a>&gt;<br>
+Date: Sun, 12 Jun 2016 18:09:56 -0700<br>
+Subject: [PATCH] qemu-native: set ld.bfd, fix cflags, and set some environment<br>
+<br>
 Upstream-Status: Pending<br>
<br>
+---<br>
+ configure | 4 ----<br>
+ 1 file changed, 4 deletions(-)<br>
+<br>
+diff --git a/configure b/configure<br>
+index 69e05fb..12fc3d8 100755<br>
 --- a/configure<br>
 +++ b/configure<br>
-@@ -4468,10 +4468,6 @@ fi<br>
+@@ -5413,10 +5413,6 @@ write_c_skeleton<br>
  if test &quot;$gcov&quot; = &quot;yes&quot; ; then<br>
    CFLAGS=&quot;-fprofile-arcs -ftest-coverage -g $CFLAGS&quot;<br>
    LDFLAGS=&quot;-fprofile-arcs -ftest-coverage $LDFLAGS&quot;<br>
@@ -12,4 +23,4 @@ Upstream-Status: Pending<br>
 -  CFLAGS=&quot;-O2 $CFLAGS&quot;<br>
  fi<br>
<br>
- ##############################<wbr>############<br>
+ if test &quot;$have_asan&quot; = &quot;yes&quot;; then<br>
diff --git a/meta/recipes-devtools/qemu/<a href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.11.1.bb</a> b/meta/recipes-devtools/qemu/<a href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.12.0.bb</a><br>
similarity index 87%<br>
rename from meta/recipes-devtools/qemu/<a href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">qem<wbr>u_2.11.1.bb</a><br>
rename to meta/recipes-devtools/qemu/<a href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">qem<wbr>u_2.12.0.bb</a><br>
index f4b7d69fca..63590fc9eb 100644<br>
--- a/meta/recipes-devtools/qemu/<a href="http://qemu_2.11.1.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.11.1.bb</a><br>
+++ b/meta/recipes-devtools/qemu/<a href="http://qemu_2.12.0.bb" rel="noreferrer" target="_blank">q<wbr>emu_2.12.0.bb</a><br>
@@ -20,8 +20,6 @@ SRC_URI = &quot;<a href="http://wiki.qemu-project.org/download/${BP}.tar.bz2" rel="noreferrer" target="_blank">http://wiki.qemu-project.org/<wbr>download/${BP}.tar.bz2</a> \<br>
            file://chardev-connect-socket-<wbr>to-a-spawned-command.patch \<br>
            file://apic-fixup-fallthrough-<wbr>to-PIC.patch \<br>
            file://linux-user-Fix-<wbr>webkitgtk-hangs-on-32-bit-x86-<wbr>target.patch \<br>
-           file://memfd.patch \<br>
-           file://0001-arm-translate-a64-<wbr>treat-DISAS_UPDATE-as-variant-<wbr>of-D.patch \<br>
            &quot;<br>
 UPSTREAM_CHECK_REGEX = &quot;qemu-(?P&lt;pver&gt;\d+\..*)\.tar&quot;<br>
<br>
@@ -31,8 +29,8 @@ SRC_URI_append_class-native = &quot; \<br>
             file://cpus.c-qemu_cpu_kick_<wbr>thread_debugging.patch \<br>
             &quot;<br>
<br>
-SRC_URI[md5sum] = &quot;<wbr>61cf862b6007eba4ac98247776af2e<wbr>27&quot;<br>
-SRC_URI[sha256sum] = &quot;<wbr>d9df2213ceed32e91dab7bc9dd19c1<wbr>af83f91ba72c7aeef7605dfaaf8173<wbr>2ccb&quot;<br>
+SRC_URI[md5sum] = &quot;<wbr>122fd7cdf241ff7eb1e42c0b503b5d<wbr>1b&quot;<br>
+SRC_URI[sha256sum] = &quot;<wbr>c9f4a147bc915d24df9784affc611a<wbr>115f42d24720a89210b479f1ba7a3f<wbr>679c&quot;<br>
<br>
 COMPATIBLE_HOST_mipsarchn32 = &quot;null&quot;<br>
 COMPATIBLE_HOST_mipsarchn64 = &quot;null&quot;<br>
<span class="HOEnZb"><font color="#888888">-- <br>
2.17.0<br>
<br>
-- <br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>