Merge tag 'pull-maintainer-may24-160524-2' of https://gitlab.com/stsquad/qemu into...

[mirror_qemu.git] / tcg / tcg-common.c

diff --git a/tcg/tcg-common.c b/tcg/tcg-common.c
index 8fa4e13305f13cf23eaac33dbe38892d103a1b05..35e7616ae9531fa3adaa1c23025e32eac7a4ca08 100644 (file)
--- a/tcg/tcg-common.c
+++ b/tcg/tcg-common.c
@@ -22,16 +22,13 @@
  * THE SOFTWARE.
  */
 
+#include "qemu/osdep.h"
 #include "tcg/tcg.h"
 
-#if defined(CONFIG_TCG_INTERPRETER)
-uintptr_t tci_tb_ptr;
-#endif
-
 TCGOpDef tcg_op_defs[] = {
 #define DEF(s, oargs, iargs, cargs, flags) \
-         { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags },
-#include "tcg-opc.h"
+         { #s, oargs, iargs, cargs, iargs + oargs + cargs, flags, NULL },
+#include "tcg/tcg-opc.h"
 #undef DEF
 };
 const size_t tcg_op_defs_max = ARRAY_SIZE(tcg_op_defs);